From 3cc421b4dcf382753fae21162ac29f65faced8a3 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Tue, 9 Jun 2026 15:57:56 +0100 Subject: [PATCH] Rebase the version-specific SQL templates to target PostgreSQL 14 The base (default) SQL templates previously targeted PostgreSQL < 12. Re-base them so the default target is 14 - the oldest supported server version - by collapsing every version bucket <= 14 (11_plus, 12_plus, 13_plus, 14_plus and the old default) into a single `default`, keeping per file the content a v14 server resolves today. Buckets for newer versions (15_plus, 16_plus, 17_plus, 18_plus) are retained as overrides. The transformation is behaviour-preserving for every server version >= 14: template (and test-fixture) resolution is byte-identical before and after for all supported versions, verified programmatically across every bucket container and confirmed by the resql, ERD and Schema Diff suites against PostgreSQL 18. Also drop PostgreSQL/EDB Advanced Server 13 from the 9.16 supported-server list and repoint the sqleditor explain_plan tests (which referenced the removed 12_plus/13_plus buckets) at the new default template. Closes #10050 --- docs/en_US/release_notes_9_16.rst | 5 +- .../publications/pg/11_plus/sql/create.sql | 20 - .../pg/11_plus/sql/properties.sql | 8 - .../publications/pg/13_plus/sql/create.sql | 23 - .../pg/13_plus/sql/properties.sql | 9 - .../publications/pg/13_plus/sql/update.sql | 48 - .../publications/pg/default/sql/create.sql | 11 +- .../pg/default/sql/properties.sql | 5 +- .../publications/pg/default/sql/update.sql | 6 + .../publications/ppas/11_plus/sql/create.sql | 20 - .../ppas/11_plus/sql/properties.sql | 8 - .../publications/ppas/13_plus/sql/create.sql | 23 - .../ppas/13_plus/sql/properties.sql | 9 - .../publications/ppas/13_plus/sql/update.sql | 48 - .../publications/ppas/default/sql/create.sql | 11 +- .../ppas/default/sql/properties.sql | 5 +- .../publications/ppas/default/sql/update.sql | 6 + .../tests/13_plus/alter_publication.sql | 7 - .../13_plus/alter_publication_add_tables.sql | 7 - .../alter_publication_add_tables_msql.sql | 2 - .../13_plus/alter_publication_drop_tables.sql | 7 - .../alter_publication_drop_tables_msql.sql | 2 - .../tests/13_plus/alter_publication_event.sql | 7 - .../13_plus/alter_publication_event_msql.sql | 2 - .../tests/13_plus/alter_publication_msql.sql | 2 - .../tests/13_plus/create_publication.sql | 7 - .../13_plus/create_publication_few_tables.sql | 7 - .../create_publication_few_tables_msql.sql | 3 - .../tests/13_plus/create_publication_msql.sql | 3 - .../13_plus/create_publication_update.sql | 7 - .../create_publication_update_msql.sql | 3 - .../publications/tests/13_plus/test.json | 168 -- .../tests/default/alter_publication.sql | 2 +- .../default/alter_publication_add_tables.sql | 2 +- .../default/alter_publication_drop_tables.sql | 2 +- .../tests/default/alter_publication_event.sql | 2 +- .../tests/default/create_publication.sql | 2 +- .../default/create_publication_few_tables.sql | 2 +- .../create_publication_few_tables_msql.sql | 2 +- .../tests/default/create_publication_msql.sql | 2 +- .../default/create_publication_update.sql | 2 +- .../create_publication_update_msql.sql | 2 +- .../publications/tests/default/test.json | 2 + .../aggregates/sql/11_plus/create.sql | 24 - .../aggregates/sql/11_plus/properties.sql | 47 - .../aggregates/sql/12_plus/create.sql | 24 - .../aggregates/sql/default/create.sql | 8 +- .../aggregates/sql/default/properties.sql | 8 + .../collations/sql/12_plus/create.sql | 59 - .../collations/sql/12_plus/properties.sql | 10 - .../collations/sql/default/create.sql | 12 + .../collations/sql/default/properties.sql | 6 +- .../{13_plus => default}/alter_collation.sql | 0 .../{13_plus => default}/create_collation.sql | 0 .../create_collation_with_extra_params.sql | 0 .../create_collation_with_libc.sql | 0 .../{13_plus => default}/msql_collation.sql | 0 .../tests/pg/{13_plus => default}/test.json | 0 .../tests/pg/12_plus/test.json | 247 -- ...amp_with_default_value_using_function.msql | 0 ...tamp_with_default_value_using_function.sql | 0 ...erated_always_column_option_variables.msql | 0 ...nerated_always_column_option_variables.sql | 0 ...amp_with_default_value_using_function.msql | 0 ...tamp_with_default_value_using_function.sql | 0 ...erated_always_column_option_variables.msql | 0 ...nerated_always_column_option_variables.sql | 0 .../tests/pg/default/test.json | 111 +- .../tests/ppas/12_plus/test.json | 213 -- ...amp_with_default_value_using_function.msql | 0 ...tamp_with_default_value_using_function.sql | 0 ...erated_always_column_option_variables.msql | 0 ...nerated_always_column_option_variables.sql | 0 ...amp_with_default_value_using_function.msql | 0 ...tamp_with_default_value_using_function.sql | 0 ...erated_always_column_option_variables.msql | 0 ...nerated_always_column_option_variables.sql | 0 .../tests/ppas/default/test.json | 85 +- .../sql/12_plus/get_columns.sql | 52 - .../sql/12_plus/get_constraints.sql | 9 - .../sql/default/get_columns.sql | 2 + .../sql/default/get_constraints.sql | 6 +- .../functions/pg/sql/11_plus/coll_stats.sql | 20 - .../functions/pg/sql/11_plus/count.sql | 9 - .../functions/pg/sql/11_plus/delete.sql | 21 - .../pg/sql/11_plus/get_definition.sql | 15 - .../functions/pg/sql/11_plus/get_oid.sql | 17 - .../functions/pg/sql/11_plus/node.sql | 26 - .../functions/pg/sql/11_plus/properties.sql | 36 - .../functions/pg/sql/12_plus/create.sql | 73 - .../functions/pg/sql/12_plus/properties.sql | 43 - .../functions/pg/sql/12_plus/update.sql | 130 - .../functions/pg/sql/13_plus/create.sql | 82 - .../functions/pg/sql/13_plus/properties.sql | 49 - .../functions/pg/sql/13_plus/update.sql | 146 - .../functions/pg/sql/14_plus/create.sql | 85 - .../functions/pg/sql/14_plus/properties.sql | 51 - .../functions/pg/sql/14_plus/update.sql | 149 - .../functions/pg/sql/default/coll_stats.sql | 2 +- .../functions/pg/sql/default/count.sql | 8 +- .../functions/pg/sql/default/create.sql | 15 + .../functions/pg/sql/default/delete.sql | 2 +- .../pg/sql/default/get_definition.sql | 2 +- .../functions/pg/sql/default/get_oid.sql | 2 +- .../get_support_functions.sql | 0 .../functions/pg/sql/default/node.sql | 2 +- .../functions/pg/sql/default/properties.sql | 22 +- .../functions/pg/sql/default/update.sql | 23 +- .../functions/ppas/sql/11_plus/coll_stats.sql | 20 - .../functions/ppas/sql/11_plus/count.sql | 9 - .../functions/ppas/sql/11_plus/delete.sql | 22 - .../ppas/sql/11_plus/get_definition.sql | 15 - .../functions/ppas/sql/11_plus/get_oid.sql | 17 - .../functions/ppas/sql/11_plus/node.sql | 27 - .../functions/ppas/sql/11_plus/properties.sql | 36 - .../functions/ppas/sql/12_plus/create.sql | 74 - .../functions/ppas/sql/12_plus/properties.sql | 37 - .../functions/ppas/sql/12_plus/update.sql | 130 - .../functions/ppas/sql/13_plus/create.sql | 83 - .../functions/ppas/sql/13_plus/properties.sql | 43 - .../functions/ppas/sql/13_plus/update.sql | 146 - .../functions/ppas/sql/14_plus/create.sql | 85 - .../functions/ppas/sql/14_plus/properties.sql | 45 - .../functions/ppas/sql/14_plus/update.sql | 149 - .../functions/ppas/sql/default/coll_stats.sql | 2 +- .../functions/ppas/sql/default/count.sql | 6 +- .../functions/ppas/sql/default/create.sql | 15 + .../functions/ppas/sql/default/delete.sql | 3 +- .../ppas/sql/default/get_definition.sql | 2 +- .../functions/ppas/sql/default/get_oid.sql | 2 +- .../get_support_functions.sql | 0 .../functions/ppas/sql/default/node.sql | 2 +- .../functions/ppas/sql/default/properties.sql | 16 +- .../functions/ppas/sql/default/update.sql | 23 +- .../procedures/pg/sql/11_plus/create.sql | 58 - .../procedures/pg/sql/11_plus/properties.sql | 47 - .../procedures/pg/sql/11_plus/update.sql | 112 - .../procedures/pg/sql/13_plus/create.sql | 66 - .../procedures/pg/sql/13_plus/properties.sql | 53 - .../procedures/pg/sql/13_plus/update.sql | 128 - .../procedures/pg/sql/14_plus/count.sql | 13 - .../pg/sql/{11_plus => default}/acl.sql | 0 .../sql/{11_plus => default}/coll_stats.sql | 0 .../pg/sql/{11_plus => default}/count.sql | 0 .../pg/sql/{14_plus => default}/create.sql | 0 .../pg/sql/{11_plus => default}/delete.sql | 0 .../{11_plus => default}/get_definition.sql | 0 .../{11_plus => default}/get_languages.sql | 0 .../pg/sql/{11_plus => default}/get_oid.sql | 0 .../{11_plus => default}/get_out_types.sql | 0 .../sql/{11_plus => default}/get_schema.sql | 0 .../pg/sql/{11_plus => default}/get_types.sql | 0 .../pg/sql/{11_plus => default}/node.sql | 0 .../sql/{14_plus => default}/properties.sql | 0 .../pg/sql/{11_plus => default}/stats.sql | 0 .../pg/sql/{14_plus => default}/update.sql | 0 .../pg/sql/{11_plus => default}/variables.sql | 0 .../ppas/sql/11_plus/coll_stats.sql | 20 - .../procedures/ppas/sql/11_plus/count.sql | 13 - .../procedures/ppas/sql/11_plus/create.sql | 66 - .../procedures/ppas/sql/11_plus/delete.sql | 21 - .../ppas/sql/11_plus/get_definition.sql | 15 - .../procedures/ppas/sql/11_plus/get_oid.sql | 17 - .../procedures/ppas/sql/11_plus/node.sql | 33 - .../ppas/sql/11_plus/properties.sql | 47 - .../procedures/ppas/sql/11_plus/update.sql | 121 - .../procedures/ppas/sql/13_plus/create.sql | 66 - .../ppas/sql/13_plus/properties.sql | 53 - .../procedures/ppas/sql/13_plus/update.sql | 128 - .../procedures/ppas/sql/14_plus/count.sql | 13 - .../procedures/ppas/sql/14_plus/create.sql | 77 - .../ppas/sql/14_plus/properties.sql | 55 - .../procedures/ppas/sql/14_plus/update.sql | 140 - .../ppas/sql/default/coll_stats.sql | 2 +- .../procedures/ppas/sql/default/count.sql | 2 +- .../procedures/ppas/sql/default/create.sql | 35 +- .../procedures/ppas/sql/default/delete.sql | 4 +- .../ppas/sql/default/get_definition.sql | 2 +- .../procedures/ppas/sql/default/get_oid.sql | 2 +- .../procedures/ppas/sql/default/node.sql | 3 +- .../ppas/sql/default/properties.sql | 13 +- .../procedures/ppas/sql/default/update.sql | 55 +- .../pg/sql/11_plus/coll_stats.sql | 20 - .../pg/sql/11_plus/count.sql | 14 - .../pg/sql/11_plus/create.sql | 57 - .../pg/sql/11_plus/delete.sql | 21 - .../pg/sql/11_plus/get_definition.sql | 15 - .../pg/sql/11_plus/get_oid.sql | 18 - .../trigger_functions/pg/sql/11_plus/node.sql | 27 - .../pg/sql/11_plus/properties.sql | 37 - .../pg/sql/11_plus/update.sql | 114 - .../pg/sql/default/coll_stats.sql | 2 +- .../pg/sql/default/count.sql | 2 +- .../pg/sql/default/delete.sql | 2 +- .../pg/sql/default/get_definition.sql | 2 +- .../pg/sql/default/get_oid.sql | 2 +- .../trigger_functions/pg/sql/default/node.sql | 2 +- .../pg/sql/default/properties.sql | 11 +- .../ppas/sql/11_plus/coll_stats.sql | 20 - .../ppas/sql/11_plus/count.sql | 13 - .../ppas/sql/11_plus/delete.sql | 21 - .../ppas/sql/11_plus/get_definition.sql | 15 - .../ppas/sql/11_plus/get_oid.sql | 18 - .../ppas/sql/11_plus/node.sql | 26 - .../ppas/sql/11_plus/properties.sql | 36 - .../ppas/sql/default/coll_stats.sql | 4 +- .../ppas/sql/default/count.sql | 3 +- .../ppas/sql/default/delete.sql | 2 +- .../ppas/sql/default/get_definition.sql | 2 +- .../ppas/sql/default/get_oid.sql | 2 +- .../ppas/sql/default/node.sql | 3 +- .../ppas/sql/default/properties.sql | 12 +- .../pg/11_plus/alter_function_add_acl.msql | 1 - .../pg/11_plus/alter_function_add_acl.sql | 24 - .../11_plus/alter_function_add_parameter.msql | 13 - .../11_plus/alter_function_add_parameter.sql | 20 - .../alter_function_change_grantee_acl.msql | 3 - .../alter_function_change_grantee_acl.sql | 21 - .../pg/11_plus/alter_function_comment.msql | 2 - .../pg/11_plus/alter_function_comment.sql | 22 - .../pg/11_plus/alter_function_delete_acl.msql | 3 - .../pg/11_plus/alter_function_delete_acl.sql | 19 - .../alter_function_delete_parameter.msql | 2 - .../alter_function_delete_parameter.sql | 19 - .../pg/11_plus/alter_function_rename.msql | 2 - .../pg/11_plus/alter_function_rename.sql | 19 - .../alter_proc_change_grantee_priv.msql | 13 - .../alter_proc_change_grantee_priv.sql | 21 - .../tests/pg/11_plus/alter_proc_comment.sql | 18 - .../tests/pg/11_plus/alter_proc_param.sql | 19 - .../tests/pg/11_plus/alter_ptrig_comment.sql | 20 - .../tests/pg/11_plus/alter_ptrig_set_1.sql | 20 - .../tests/pg/11_plus/alter_ptrig_set_2.sql | 22 - .../tests/pg/11_plus/alter_ptrig_set_3.sql | 23 - .../pg/11_plus/create_event_trigger_full.sql | 26 - .../tests/pg/11_plus/create_function.msql | 14 - .../tests/pg/11_plus/create_function.sql | 20 - .../pg/11_plus/create_function_for_alter.msql | 14 - .../pg/11_plus/create_function_for_alter.sql | 19 - .../tests/pg/11_plus/create_plain_trigger.sql | 17 - .../pg/11_plus/create_plain_trigger_full.sql | 27 - .../tests/pg/11_plus/create_procedure.sql | 15 - .../tests/pg/11_plus/test_function.json | 354 --- .../tests/pg/11_plus/test_procedures.json | 155 -- .../pg/11_plus/test_trigger_functions.json | 214 -- .../pg/12_plus/alter_function_add_acl.msql | 1 - .../pg/12_plus/alter_function_add_acl.sql | 24 - .../12_plus/alter_function_add_parameter.msql | 14 - .../12_plus/alter_function_add_parameter.sql | 20 - .../alter_function_change_grantee_acl.msql | 3 - .../alter_function_change_grantee_acl.sql | 21 - .../pg/12_plus/alter_function_comment.msql | 2 - .../pg/12_plus/alter_function_comment.sql | 22 - .../pg/12_plus/alter_function_delete_acl.msql | 3 - .../pg/12_plus/alter_function_delete_acl.sql | 19 - .../alter_function_delete_parameter.msql | 2 - .../alter_function_delete_parameter.sql | 19 - .../pg/12_plus/alter_function_rename.msql | 2 - .../pg/12_plus/alter_function_rename.sql | 19 - .../tests/pg/12_plus/alter_proc_add_priv.sql | 23 - .../alter_proc_change_grantee_priv.sql | 21 - .../tests/pg/12_plus/alter_proc_comment.sql | 18 - .../pg/12_plus/alter_proc_comment_msql.sql | 2 - .../pg/12_plus/alter_proc_delete_priv.sql | 23 - .../tests/pg/12_plus/alter_proc_param.sql | 19 - .../pg/12_plus/alter_proc_param_msql.sql | 2 - .../tests/pg/12_plus/alter_ptrig_comment.sql | 20 - .../tests/pg/12_plus/alter_ptrig_set_1.sql | 20 - .../tests/pg/12_plus/alter_ptrig_set_2.sql | 22 - .../tests/pg/12_plus/alter_ptrig_set_3.sql | 23 - .../pg/12_plus/create_event_trigger_full.sql | 26 - .../tests/pg/12_plus/create_function.msql | 14 - .../tests/pg/12_plus/create_function.sql | 20 - .../pg/12_plus/create_function_for_alter.msql | 14 - .../pg/12_plus/create_function_for_alter.sql | 19 - .../tests/pg/12_plus/create_plain_trigger.sql | 17 - .../pg/12_plus/create_plain_trigger_full.sql | 27 - .../tests/pg/12_plus/create_procedure.msql | 10 - .../tests/pg/12_plus/create_procedure.sql | 15 - .../tests/pg/12_plus/test_function.json | 356 --- .../tests/pg/12_plus/test_procedures.json | 166 -- .../pg/12_plus/test_trigger_functions.json | 214 -- .../pg/13_plus/alter_proc_no_depends.sql | 18 - .../13_plus/create_procedure_on_depends.msql | 16 - .../13_plus/create_procedure_on_depends.sql | 21 - .../tests/pg/13_plus/test_function.json | 448 ---- .../tests/pg/13_plus/test_procedures.json | 248 -- .../tests/pg/14_plus/alter_proc_add_priv.msql | 3 - .../tests/pg/14_plus/test_function.json | 487 ---- .../pg/14_plus/test_trigger_functions.json | 214 -- .../alter_func_remove_partial_pri.msql | 0 .../alter_func_remove_partial_pri.sql | 0 .../default/alter_function_add_parameter.msql | 1 + .../alter_function_no_depends.msql | 0 .../alter_function_no_depends.sql | 0 .../alter_proc_add_priv.msql | 0 .../alter_proc_add_priv.sql | 0 .../alter_proc_change_grantee_priv.msql | 0 .../alter_proc_change_grantee_priv.sql | 0 .../alter_proc_comment.sql | 0 .../alter_proc_comment_msql.sql | 0 .../alter_proc_delete_priv.msql | 0 .../alter_proc_delete_priv.sql | 0 .../alter_proc_no_depends.msql | 0 .../alter_proc_no_depends.sql | 0 .../{14_plus => default}/alter_proc_param.sql | 0 .../alter_proc_param_msql.sql | 0 .../create_atomic_func.msql | 0 .../create_atomic_func.sql | 0 .../create_atomic_proc.msql | 0 .../create_atomic_proc.sql | 0 .../pg/default/create_event_trigger_full.sql | 2 +- .../create_function_on_depends.msql | 0 .../create_function_on_depends.sql | 0 .../pg/default/create_plain_trigger_full.sql | 2 +- .../create_procedure.msql | 0 .../{14_plus => default}/create_procedure.sql | 0 .../create_procedure_on_depends.msql | 0 .../create_procedure_on_depends.sql | 0 .../tests/pg/default/test_function.json | 137 +- .../{14_plus => default}/test_procedures.json | 0 .../pg/default/test_trigger_functions.json | 4 +- .../ppas/11_plus/alter_function_add_acl.msql | 3 - .../ppas/11_plus/alter_function_add_acl.sql | 24 - .../11_plus/alter_function_add_parameter.msql | 13 - .../11_plus/alter_function_add_parameter.sql | 20 - .../alter_function_change_grantee_acl.msql | 3 - .../alter_function_change_grantee_acl.sql | 21 - .../ppas/11_plus/alter_function_comment.msql | 2 - .../ppas/11_plus/alter_function_comment.sql | 22 - .../11_plus/alter_function_delete_acl.msql | 3 - .../11_plus/alter_function_delete_acl.sql | 19 - .../alter_function_delete_parameter.msql | 2 - .../alter_function_delete_parameter.sql | 19 - .../ppas/11_plus/alter_function_rename.msql | 2 - .../ppas/11_plus/alter_function_rename.sql | 19 - .../alter_proc_change_grantee_priv.msql | 13 - .../alter_proc_change_grantee_priv.sql | 21 - .../tests/ppas/11_plus/alter_proc_comment.sql | 18 - .../ppas/11_plus/alter_proc_comment_msql.sql | 2 - .../tests/ppas/11_plus/alter_proc_param.sql | 19 - .../ppas/11_plus/alter_proc_param_msql.sql | 2 - .../ppas/11_plus/alter_ptrig_comment.sql | 20 - .../tests/ppas/11_plus/alter_ptrig_set_1.sql | 20 - .../tests/ppas/11_plus/alter_ptrig_set_2.sql | 22 - .../tests/ppas/11_plus/alter_ptrig_set_3.sql | 23 - .../11_plus/create_event_trigger_full.sql | 22 - .../tests/ppas/11_plus/create_function.msql | 14 - .../tests/ppas/11_plus/create_function.sql | 19 - .../11_plus/create_function_for_alter.msql | 14 - .../11_plus/create_function_for_alter.sql | 19 - .../ppas/11_plus/create_plain_trigger.sql | 17 - .../11_plus/create_plain_trigger_full.sql | 23 - .../tests/ppas/11_plus/create_procedure.sql | 15 - .../tests/ppas/11_plus/test_function.json | 370 --- .../tests/ppas/11_plus/test_procedures.json | 142 - .../ppas/11_plus/test_trigger_functions.json | 171 -- .../ppas/12_plus/alter_function_add_acl.msql | 3 - .../ppas/12_plus/alter_function_add_acl.sql | 24 - .../12_plus/alter_function_add_parameter.msql | 14 - .../12_plus/alter_function_add_parameter.sql | 20 - .../alter_function_change_grantee_acl.msql | 3 - .../alter_function_change_grantee_acl.sql | 21 - .../ppas/12_plus/alter_function_comment.msql | 2 - .../ppas/12_plus/alter_function_comment.sql | 22 - .../12_plus/alter_function_delete_acl.msql | 3 - .../12_plus/alter_function_delete_acl.sql | 19 - .../alter_function_delete_parameter.msql | 2 - .../alter_function_delete_parameter.sql | 19 - .../ppas/12_plus/alter_function_rename.msql | 2 - .../ppas/12_plus/alter_function_rename.sql | 19 - .../ppas/12_plus/alter_proc_add_priv.sql | 23 - .../alter_proc_change_grantee_priv.msql | 3 - .../alter_proc_change_grantee_priv.sql | 21 - .../tests/ppas/12_plus/alter_proc_comment.sql | 18 - .../ppas/12_plus/alter_proc_comment_msql.sql | 2 - .../ppas/12_plus/alter_proc_delete_priv.msql | 1 - .../ppas/12_plus/alter_proc_delete_priv.sql | 23 - .../tests/ppas/12_plus/alter_proc_param.sql | 19 - .../ppas/12_plus/alter_proc_param_msql.sql | 2 - .../ppas/12_plus/alter_ptrig_comment.sql | 20 - .../tests/ppas/12_plus/alter_ptrig_set_1.sql | 20 - .../tests/ppas/12_plus/alter_ptrig_set_2.sql | 22 - .../tests/ppas/12_plus/alter_ptrig_set_3.sql | 23 - .../12_plus/create_event_trigger_full.sql | 26 - .../tests/ppas/12_plus/create_function.msql | 14 - .../tests/ppas/12_plus/create_function.sql | 19 - .../12_plus/create_function_for_alter.msql | 14 - .../12_plus/create_function_for_alter.sql | 19 - .../ppas/12_plus/create_plain_trigger.sql | 17 - .../12_plus/create_plain_trigger_full.sql | 27 - .../tests/ppas/12_plus/create_procedure.msql | 10 - .../tests/ppas/12_plus/create_procedure.sql | 15 - .../tests/ppas/12_plus/test_function.json | 372 --- .../tests/ppas/12_plus/test_procedures.json | 142 - .../ppas/12_plus/test_trigger_functions.json | 191 -- .../ppas/13_plus/alter_proc_no_depends.msql | 2 - .../ppas/13_plus/alter_proc_no_depends.sql | 18 - .../13_plus/create_procedure_on_depends.msql | 16 - .../13_plus/create_procedure_on_depends.sql | 21 - .../tests/ppas/13_plus/test_function.json | 459 ---- .../tests/ppas/13_plus/test_procedures.json | 155 -- .../ppas/14_plus/alter_proc_add_priv.msql | 3 - .../alter_proc_change_grantee_priv.sql | 20 - .../tests/ppas/14_plus/alter_proc_comment.sql | 17 - .../ppas/14_plus/alter_proc_delete_priv.msql | 1 - .../ppas/14_plus/alter_proc_no_depends.msql | 2 - .../tests/ppas/14_plus/alter_proc_param.sql | 18 - .../tests/ppas/14_plus/create_procedure.sql | 14 - .../tests/ppas/14_plus/test_function.json | 499 ---- .../tests/ppas/14_plus/test_procedures.json | 261 -- .../ppas/14_plus/test_trigger_functions.json | 191 -- .../alter_func_remove_partial_pri.msql | 0 .../alter_func_remove_partial_pri.sql | 0 .../default/alter_function_add_parameter.msql | 5 +- .../alter_function_no_depends.msql | 0 .../alter_function_no_depends.sql | 0 .../alter_proc_add_priv.msql | 0 .../alter_proc_add_priv.sql | 0 .../alter_proc_change_grantee_priv.msql | 12 +- .../alter_proc_change_grantee_priv.sql | 5 +- .../tests/ppas/default/alter_proc_comment.sql | 14 +- .../ppas/default/alter_proc_comment_msql.sql | 2 +- .../default}/alter_proc_delete_priv.msql | 0 .../alter_proc_delete_priv.sql | 0 .../default}/alter_proc_no_depends.msql | 0 .../alter_proc_no_depends.sql | 0 .../tests/ppas/default/alter_proc_param.sql | 14 +- .../ppas/default/alter_proc_param_msql.sql | 2 +- .../create_atomic_func.msql | 0 .../create_atomic_func.sql | 0 .../create_atomic_proc.msql | 0 .../create_atomic_proc.sql | 0 .../default/create_event_trigger_full.sql | 4 + .../create_function_on_depends.msql | 0 .../create_function_on_depends.sql | 0 .../default/create_plain_trigger_full.sql | 6 +- .../create_procedure.msql | 0 .../tests/ppas/default/create_procedure.sql | 12 +- .../create_procedure_on_depends.msql | 0 .../create_procedure_on_depends.sql | 0 .../tests/ppas/default/test_function.json | 133 +- .../tests/ppas/default/test_procedures.json | 193 +- .../ppas/default/test_trigger_functions.json | 36 +- .../operators/sql/11_plus/create.sql | 13 - .../operators/sql/default/create.sql | 2 +- .../edbfuncs/ppas/11_plus/get_oid.sql | 17 - .../edbfuncs/ppas/11_plus/properties.sql | 27 - .../edbfuncs/ppas/default/get_oid.sql | 2 +- .../edbfuncs/ppas/default/properties.sql | 2 +- .../edbprocs/ppas/11_plus/get_oid.sql | 17 - .../edbprocs/ppas/11_plus/properties.sql | 27 - .../edbprocs/ppas/default/get_oid.sql | 2 +- .../edbprocs/ppas/default/properties.sql | 4 +- .../templates/packages/ppas/12_plus/count.sql | 6 - .../templates/packages/ppas/12_plus/nodes.sql | 16 - .../templates/packages/ppas/default/count.sql | 3 +- .../templates/packages/ppas/default/nodes.sql | 1 + .../alter_package_headers_and_comment.sql | 21 - ...alter_package_headers_and_comment_msql.sql | 4 - .../create_package_with_all_options.sql | 23 - .../create_package_with_all_options_msql.sql | 17 - .../packages/tests/ppas/14_plus/test.json | 65 - .../alter_package_headers_and_comment.sql | 4 +- .../create_package_with_all_options.sql | 4 +- .../12_plus/alter_column_alt_privilege.msql | 2 - .../pg/12_plus/alter_column_alt_privilege.sql | 13 - .../tests/pg/12_plus/alter_column_char.msql | 15 - .../tests/pg/12_plus/alter_column_char.sql | 17 - .../12_plus/alter_column_drop_identity.msql | 2 - .../pg/12_plus/alter_column_drop_identity.sql | 11 - ...alter_column_drop_identity_by_default.msql | 2 - .../alter_column_drop_identity_by_default.sql | 9 - .../pg/12_plus/alter_column_identity.msql | 7 - .../pg/12_plus/alter_column_identity.sql | 11 - .../alter_column_identity_by_default.msql | 8 - .../alter_column_identity_by_default.sql | 9 - ...er_column_identity_for_comb_start_seq.msql | 2 - ...ter_column_identity_for_comb_start_seq.sql | 9 - ...alter_column_identity_for_restart_seq.msql | 2 - .../alter_column_identity_for_restart_seq.sql | 9 - .../tests/pg/12_plus/alter_column_int.msql | 9 - .../tests/pg/12_plus/alter_column_int.sql | 11 - .../pg/12_plus/alter_column_numeric.msql | 9 - .../tests/pg/12_plus/alter_column_numeric.sql | 15 - .../12_plus/alter_column_remove_length.msql | 2 - .../pg/12_plus/alter_column_remove_length.sql | 15 - .../alter_column_text_with_default_value.msql | 4 - .../alter_column_text_with_default_value.sql | 11 - .../tests/pg/12_plus/create_column_char.msql | 5 - .../tests/pg/12_plus/create_column_char.sql | 9 - ...reate_column_identity_for_restart_seq.msql | 5 - ...create_column_identity_for_restart_seq.sql | 9 - .../tests/pg/12_plus/create_column_int.msql | 5 - .../tests/pg/12_plus/create_column_int.sql | 9 - .../12_plus/create_column_int_identity.msql | 5 - .../pg/12_plus/create_column_int_identity.sql | 9 - ...create_column_int_identity_by_default.msql | 5 - .../create_column_int_identity_by_default.sql | 9 - .../pg/12_plus/create_column_numeric.msql | 9 - .../pg/12_plus/create_column_numeric.sql | 13 - .../tables/columns/tests/pg/12_plus/test.json | 882 ------ .../tables/columns/tests/pg/14_plus/test.json | 926 ------- .../default/alter_column_alt_privilege.msql | 4 +- .../pg/default/alter_column_alt_privilege.sql | 14 +- .../tests/pg/default/alter_column_char.msql | 12 +- .../tests/pg/default/alter_column_char.sql | 16 +- .../alter_column_compression.msql | 0 .../alter_column_compression.sql | 0 .../default/alter_column_drop_identity.msql | 2 +- .../pg/default/alter_column_drop_identity.sql | 12 +- ...alter_column_drop_identity_by_default.msql | 4 +- .../alter_column_drop_identity_by_default.sql | 10 +- .../alter_column_generated.msql | 0 .../alter_column_generated.sql | 0 ...olumn_generated_with_existing_columns.msql | 0 ...column_generated_with_existing_columns.sql | 0 .../pg/default/alter_column_identity.msql | 6 +- .../pg/default/alter_column_identity.sql | 12 +- .../alter_column_identity_by_default.msql | 10 +- .../alter_column_identity_by_default.sql | 10 +- ...er_column_identity_for_comb_start_seq.msql | 2 +- ...ter_column_identity_for_comb_start_seq.sql | 10 +- ...alter_column_identity_for_restart_seq.msql | 2 +- .../alter_column_identity_for_restart_seq.sql | 10 +- .../tests/pg/default/alter_column_int.msql | 8 +- .../tests/pg/default/alter_column_int.sql | 12 +- .../pg/default/alter_column_numeric.msql | 12 +- .../tests/pg/default/alter_column_numeric.sql | 16 +- .../default/alter_column_remove_length.msql | 4 +- .../pg/default/alter_column_remove_length.sql | 16 +- .../alter_column_text_with_default_value.msql | 4 +- .../alter_column_text_with_default_value.sql | 12 +- ...amp_with_default_value_using_function.msql | 6 +- ...tamp_with_default_value_using_function.sql | 10 +- ...olumn_with_interger_array_and_options.msql | 2 +- ...column_with_interger_array_and_options.sql | 12 +- .../tests/pg/default/create_column_char.msql | 6 +- .../tests/pg/default/create_column_char.sql | 10 +- .../create_column_comp.msql | 0 .../create_column_comp.sql | 0 ...reate_column_identity_for_restart_seq.msql | 6 +- ...create_column_identity_for_restart_seq.sql | 10 +- .../tests/pg/default/create_column_int.msql | 6 +- .../tests/pg/default/create_column_int.sql | 10 +- .../create_column_int_generated.msql | 0 .../create_column_int_generated.sql | 0 ...n_int_generated_with_existing_columns.msql | 0 ...mn_int_generated_with_existing_columns.sql | 0 .../default/create_column_int_identity.msql | 6 +- .../pg/default/create_column_int_identity.sql | 10 +- ...create_column_int_identity_by_default.msql | 6 +- .../create_column_int_identity_by_default.sql | 10 +- .../pg/default/create_column_numeric.msql | 10 +- .../pg/default/create_column_numeric.sql | 14 +- ...create_column_text_with_default_value.msql | 6 +- .../create_column_text_with_default_value.sql | 10 +- ...amp_with_default_value_using_function.msql | 6 +- ...tamp_with_default_value_using_function.sql | 10 +- ...olumn_with_interger_array_and_options.msql | 8 +- ...column_with_interger_array_and_options.sql | 12 +- .../tables/columns/tests/pg/default/test.json | 258 +- .../12_plus/alter_column_alt_privilege.msql | 2 - .../12_plus/alter_column_alt_privilege.sql | 13 - .../tests/ppas/12_plus/alter_column_char.msql | 15 - .../tests/ppas/12_plus/alter_column_char.sql | 17 - .../12_plus/alter_column_drop_identity.msql | 2 - .../12_plus/alter_column_drop_identity.sql | 11 - ...alter_column_drop_identity_by_default.msql | 2 - .../alter_column_drop_identity_by_default.sql | 9 - .../ppas/12_plus/alter_column_identity.msql | 7 - .../ppas/12_plus/alter_column_identity.sql | 11 - .../alter_column_identity_by_default.msql | 8 - .../alter_column_identity_by_default.sql | 9 - ...er_column_identity_for_comb_start_seq.msql | 2 - ...ter_column_identity_for_comb_start_seq.sql | 9 - ...alter_column_identity_for_restart_seq.msql | 2 - .../alter_column_identity_for_restart_seq.sql | 9 - .../tests/ppas/12_plus/alter_column_int.msql | 9 - .../tests/ppas/12_plus/alter_column_int.sql | 11 - .../ppas/12_plus/alter_column_numeric.msql | 9 - .../ppas/12_plus/alter_column_numeric.sql | 15 - .../12_plus/alter_column_remove_length.msql | 2 - .../12_plus/alter_column_remove_length.sql | 15 - .../alter_column_text_with_default_value.msql | 4 - .../alter_column_text_with_default_value.sql | 11 - ...amp_with_default_value_using_function.msql | 7 - ...tamp_with_default_value_using_function.sql | 9 - ...olumn_with_interger_array_and_options.msql | 3 - ...column_with_interger_array_and_options.sql | 13 - .../ppas/12_plus/create_column_char.msql | 5 - .../tests/ppas/12_plus/create_column_char.sql | 9 - ...reate_column_identity_for_restart_seq.msql | 5 - ...create_column_identity_for_restart_seq.sql | 9 - .../tests/ppas/12_plus/create_column_int.msql | 5 - .../tests/ppas/12_plus/create_column_int.sql | 9 - .../12_plus/create_column_int_identity.msql | 5 - .../12_plus/create_column_int_identity.sql | 9 - ...create_column_int_identity_by_default.msql | 5 - .../create_column_int_identity_by_default.sql | 9 - .../ppas/12_plus/create_column_numeric.msql | 9 - .../ppas/12_plus/create_column_numeric.sql | 13 - ...create_column_text_with_default_value.msql | 5 - .../create_column_text_with_default_value.sql | 9 - ...amp_with_default_value_using_function.msql | 5 - ...tamp_with_default_value_using_function.sql | 9 - ...olumn_with_interger_array_and_options.msql | 9 - ...column_with_interger_array_and_options.sql | 13 - .../columns/tests/ppas/12_plus/test.json | 714 ----- .../columns/tests/ppas/14_plus/test.json | 926 ------- .../default/alter_column_alt_privilege.msql | 4 +- .../default/alter_column_alt_privilege.sql | 14 +- .../tests/ppas/default/alter_column_char.msql | 12 +- .../tests/ppas/default/alter_column_char.sql | 16 +- .../alter_column_compression.msql | 0 .../alter_column_compression.sql | 0 .../default/alter_column_drop_identity.msql | 2 +- .../default/alter_column_drop_identity.sql | 12 +- ...alter_column_drop_identity_by_default.msql | 4 +- .../alter_column_drop_identity_by_default.sql | 10 +- .../alter_column_generated.msql | 0 .../alter_column_generated.sql | 0 ...olumn_generated_with_existing_columns.msql | 0 ...column_generated_with_existing_columns.sql | 0 .../ppas/default/alter_column_identity.msql | 6 +- .../ppas/default/alter_column_identity.sql | 12 +- .../alter_column_identity_by_default.msql | 10 +- .../alter_column_identity_by_default.sql | 10 +- ...er_column_identity_for_comb_start_seq.msql | 2 +- ...ter_column_identity_for_comb_start_seq.sql | 10 +- ...alter_column_identity_for_restart_seq.msql | 2 +- .../alter_column_identity_for_restart_seq.sql | 10 +- .../tests/ppas/default/alter_column_int.msql | 8 +- .../tests/ppas/default/alter_column_int.sql | 12 +- .../ppas/default/alter_column_numeric.msql | 12 +- .../ppas/default/alter_column_numeric.sql | 16 +- .../default/alter_column_remove_length.msql | 4 +- .../default/alter_column_remove_length.sql | 16 +- .../alter_column_text_with_default_value.msql | 15 +- .../alter_column_text_with_default_value.sql | 14 +- ...amp_with_default_value_using_function.msql | 0 ...tamp_with_default_value_using_function.sql | 0 ...olumn_with_interger_array_and_options.msql | 0 ...column_with_interger_array_and_options.sql | 0 .../ppas/default/create_column_char.msql | 6 +- .../tests/ppas/default/create_column_char.sql | 10 +- .../create_column_comp.msql | 0 .../create_column_comp.sql | 0 ...reate_column_identity_for_restart_seq.msql | 6 +- ...create_column_identity_for_restart_seq.sql | 10 +- .../tests/ppas/default/create_column_int.msql | 6 +- .../tests/ppas/default/create_column_int.sql | 10 +- .../create_column_int_generated.msql | 0 .../create_column_int_generated.sql | 0 ...n_int_generated_with_existing_columns.msql | 0 ...mn_int_generated_with_existing_columns.sql | 0 .../default/create_column_int_identity.msql | 6 +- .../default/create_column_int_identity.sql | 10 +- ...create_column_int_identity_by_default.msql | 6 +- .../create_column_int_identity_by_default.sql | 10 +- .../ppas/default/create_column_numeric.msql | 10 +- .../ppas/default/create_column_numeric.sql | 14 +- ...create_column_text_with_default_value.msql | 0 .../create_column_text_with_default_value.sql | 0 ...amp_with_default_value_using_function.msql | 0 ...tamp_with_default_value_using_function.sql | 0 ...olumn_with_interger_array_and_options.msql | 0 ...column_with_interger_array_and_options.sql | 0 .../columns/tests/ppas/default/test.json | 422 ++- .../alter_event_comment_code.sql | 0 .../create_for_all_event.sql | 0 .../create_for_insert_delete.sql | 0 .../create_for_insert_update_on_columns.sql | 0 .../create_for_insert_with_when.sql | 0 .../tests/ppas/{12_plus => default}/test.json | 0 .../11_plus/alter_exclusion_constraint.sql | 14 - .../alter_exclusion_constraint_msql.sql | 6 - .../11_plus/create_exclusion_constraint.sql | 15 - .../create_exclusion_constraint_exp.sql | 14 - .../create_exclusion_constraint_msql.sql | 10 - .../tests/11_plus/test.json | 183 -- .../default/alter_exclusion_constraint.sql | 5 +- .../default/create_exclusion_constraint.sql | 6 +- .../create_exclusion_constraint_exp_msql.sql | 0 .../create_exclusion_constraint_msql.sql | 5 +- .../tests/default/test.json | 98 +- .../tests/11_plus/alter_pkey_constraint.sql | 13 - .../11_plus/alter_pkey_constraint_msql.sql | 6 - .../alter_pkey_constraint_with_index.sql | 11 - .../alter_pkey_constraint_with_index_msql.sql | 6 - .../11_plus/alter_pkey_reset_fillfactor.sql | 12 - .../alter_pkey_reset_fillfactor_msql.sql | 2 - .../tests/11_plus/alter_unique_constraint.sql | 12 - .../11_plus/alter_unique_constraint_msql.sql | 6 - .../alter_unique_constraint_with_index.sql | 11 - ...lter_unique_constraint_with_index_msql.sql | 6 - .../11_plus/alter_unique_reset_fillfactor.sql | 12 - .../alter_unique_reset_fillfactor_msql.sql | 2 - .../tests/11_plus/create_pkey_constraint.sql | 12 - .../11_plus/create_pkey_constraint_msql.sql | 8 - .../create_pkey_constraint_with_index.sql | 10 - ...create_pkey_constraint_with_index_msql.sql | 5 - .../11_plus/create_unique_constraint.sql | 12 - .../11_plus/create_unique_constraint_msql.sql | 8 - .../create_unique_constraint_with_index.sql | 10 - ...eate_unique_constraint_with_index_msql.sql | 5 - .../tests/11_plus/test_primary_key.json | 132 - .../tests/11_plus/test_unique_constraint.json | 132 - .../tests/default/alter_pkey_constraint.sql | 1 + .../default/alter_pkey_reset_fillfactor.sql | 1 + .../tests/default/alter_unique_constraint.sql | 1 + .../default/alter_unique_reset_fillfactor.sql | 1 + .../tests/default/create_pkey_constraint.sql | 1 + .../default/create_pkey_constraint_msql.sql | 1 + .../default/create_unique_constraint.sql | 1 + .../default/create_unique_constraint_msql.sql | 1 + .../tests/default/test_primary_key.json | 26 +- .../tests/default/test_unique_constraint.json | 26 +- .../tests/11_plus/alter_expr_statistics.sql | 14 - .../11_plus/alter_name_fillfactor_comment.sql | 16 - .../alter_reset_fillfactor_cluster.sql | 12 - .../11_plus/create_btree_asc_null_first.sql | 14 - .../create_btree_asc_null_first_msql.sql | 10 - .../11_plus/create_btree_asc_null_last.sql | 14 - .../create_btree_asc_null_last_msql.sql | 10 - .../11_plus/create_btree_desc_null_first.sql | 10 - .../create_btree_desc_null_first_msql.sql | 5 - .../11_plus/create_btree_desc_null_last.sql | 14 - .../create_btree_desc_null_last_msql.sql | 10 - .../create_btree_expr_asc_null_last.sql | 14 - .../create_btree_expr_asc_null_last_msql.sql | 10 - .../indexes/tests/11_plus/test_indexes.json | 364 --- .../tests/13_plus/alter_expr_statistics.sql | 14 - .../13_plus/alter_name_fillfactor_comment.sql | 15 - .../alter_reset_fillfactor_cluster.sql | 12 - .../13_plus/create_btree_asc_null_first.sql | 14 - .../create_btree_asc_null_first_msql.sql | 10 - .../13_plus/create_btree_asc_null_last.sql | 14 - .../create_btree_asc_null_last_msql.sql | 10 - .../13_plus/create_btree_desc_null_first.sql | 9 - .../13_plus/create_btree_desc_null_last.sql | 14 - .../create_btree_desc_null_last_msql.sql | 10 - .../create_btree_expr_asc_null_last.sql | 14 - .../indexes/tests/13_plus/test_indexes.json | 452 ---- .../tests/default/alter_expr_statistics.sql | 1 + .../alter_expr_statistics_msql.sql | 0 .../alter_index_no_depends.msql | 0 .../alter_index_no_depends.sql | 0 .../default/alter_name_fillfactor_comment.sql | 2 +- .../alter_reset_fillfactor_cluster.sql | 1 + .../default/create_btree_asc_null_first.sql | 3 +- .../create_btree_asc_null_first_msql.sql | 3 +- .../default/create_btree_asc_null_last.sql | 3 +- .../create_btree_asc_null_last_msql.sql | 3 +- .../default/create_btree_desc_null_first.sql | 1 + .../create_btree_desc_null_first_msql.sql | 1 + .../default/create_btree_desc_null_last.sql | 3 +- .../create_btree_desc_null_last_msql.sql | 3 +- .../create_btree_expr_asc_null_last.sql | 3 +- .../create_btree_expr_asc_null_last_msql.sql | 1 + .../create_index_with_ext.msql | 0 .../create_index_with_ext.sql | 0 .../indexes/tests/default/test_indexes.json | 698 +++-- .../pg/12_plus/alter_table_add_partition.sql | 23 - .../alter_table_add_partition_msql.sql | 2 - .../12_plus/create_table_with_partition.sql | 14 - .../create_table_with_partition_msql.sql | 10 - .../tests/pg/12_plus/test_partitions.json | 139 - .../pg/default/alter_table_add_partition.sql | 6 +- .../default/create_table_with_partition.sql | 6 +- .../create_table_with_partition_msql.sql | 5 +- .../12_plus/alter_table_add_partition.sql | 23 - .../alter_table_add_partition_msql.sql | 2 - .../12_plus/create_table_with_partition.sql | 14 - .../create_table_with_partition_msql.sql | 10 - .../tests/ppas/12_plus/test_partitions.json | 139 - .../default/alter_table_add_partition.sql | 6 +- .../default/create_table_with_partition.sql | 6 +- .../create_table_with_partition_msql.sql | 5 +- .../tests/12_plus/alter_select_policy.sql | 14 - .../12_plus/alter_simple_insert_policy.sql | 10 - ...ter_update_policy_with_check_and_using.sql | 11 - .../create_delete_policy_with_using.sql | 10 - .../tests/12_plus/test.json | 349 --- .../tests/default/alter_select_policy.sql | 6 +- .../default/alter_simple_insert_policy.sql | 2 +- ...ter_update_policy_with_check_and_using.sql | 2 +- .../create_delete_policy_with_using.sql | 2 +- .../templates/columns/sql/12_plus/create.sql | 60 - .../columns/sql/12_plus/properties.sql | 42 - .../templates/columns/sql/14_plus/create.sql | 66 - .../columns/sql/14_plus/properties.sql | 61 - .../templates/columns/sql/14_plus/update.sql | 215 -- .../templates/columns/sql/default/create.sql | 12 +- .../columns/sql/default/properties.sql | 24 +- .../templates/columns/sql/default/update.sql | 8 +- .../{12_plus => default}/backend_support.sql | 0 .../sql/ppas/{12_plus => default}/count.sql | 0 .../sql/ppas/{12_plus => default}/create.sql | 0 .../sql/ppas/{12_plus => default}/delete.sql | 0 .../enable_disable_trigger.sql | 0 .../ppas/{12_plus => default}/get_columns.sql | 0 .../sql/ppas/{12_plus => default}/get_oid.sql | 0 .../ppas/{12_plus => default}/get_parent.sql | 0 .../sql/ppas/{12_plus => default}/nodes.sql | 0 .../ppas/{12_plus => default}/properties.sql | 0 .../sql/ppas/{12_plus => default}/update.sql | 0 .../sql/11_plus/create.sql | 21 - .../sql/11_plus/properties.sql | 33 - .../sql/default/create.sql | 4 +- .../get_constraint_include.sql | 0 .../sql/default/properties.sql | 2 +- .../index_constraint/sql/11_plus/create.sql | 20 - .../sql/11_plus/properties.sql | 31 - .../index_constraint/sql/default/create.sql | 5 +- .../get_constraint_include.sql | 0 .../sql/default/properties.sql | 2 +- .../indexes/sql/11_plus/column_details.sql | 33 - .../templates/indexes/sql/11_plus/create.sql | 26 - .../indexes/sql/11_plus/properties.sql | 73 - .../templates/indexes/sql/13_plus/create.sql | 33 - .../indexes/sql/13_plus/properties.sql | 80 - .../templates/indexes/sql/13_plus/update.sql | 110 - .../indexes/sql/default/column_details.sql | 2 +- .../templates/indexes/sql/default/create.sql | 19 +- .../{11_plus => default}/include_details.sql | 0 .../indexes/sql/default/properties.sql | 108 +- .../templates/indexes/sql/default/update.sql | 14 + .../sql/pg/11_plus/partition_diff.sql | 24 - .../partitions/sql/pg/12_plus/create.sql | 74 - .../partitions/sql/pg/12_plus/nodes.sql | 55 - .../partitions/sql/pg/12_plus/properties.sql | 77 - .../partitions/sql/pg/14_plus/nodes.sql | 55 - .../partitions/sql/pg/default/create.sql | 7 + .../partitions/sql/pg/default/nodes.sql | 3 +- .../sql/pg/default/partition_diff.sql | 4 +- .../partitions/sql/pg/default/properties.sql | 8 +- .../sql/ppas/11_plus/partition_diff.sql | 24 - .../partitions/sql/ppas/12_plus/create.sql | 72 - .../partitions/sql/ppas/12_plus/nodes.sql | 55 - .../sql/ppas/12_plus/properties.sql | 77 - .../partitions/sql/ppas/14_plus/nodes.sql | 55 - .../partitions/sql/ppas/default/create.sql | 7 + .../partitions/sql/ppas/default/nodes.sql | 3 +- .../sql/ppas/default/partition_diff.sql | 12 +- .../sql/ppas/default/properties.sql | 14 +- .../templates/tables/sql/11_plus/create.sql | 219 -- .../tables/sql/11_plus/properties.sql | 75 - .../templates/tables/sql/11_plus/update.sql | 299 --- .../templates/tables/sql/12_plus/create.sql | 245 -- .../12_plus/get_tables_for_constraints.sql | 8 - .../tables/sql/12_plus/properties.sql | 77 - .../templates/tables/sql/12_plus/update.sql | 292 -- .../templates/tables/sql/14_plus/create.sql | 247 -- .../templates/tables/sql/default/create.sql | 65 +- .../get_access_methods.sql | 0 .../{11_plus => default}/get_collation.sql | 0 .../default/get_tables_for_constraints.sql | 2 +- .../tables/sql/default/properties.sql | 9 +- .../templates/tables/sql/default/update.sql | 81 +- .../triggers/sql/pg/11_plus/create.sql | 37 - .../triggers/sql/pg/11_plus/update.sql | 61 - .../triggers/sql/pg/14_plus/create.sql | 37 - .../triggers/sql/pg/14_plus/update.sql | 61 - .../triggers/sql/pg/default/create.sql | 2 +- .../triggers/sql/pg/default/update.sql | 2 +- .../triggers/sql/ppas/11_plus/create.sql | 37 - .../triggers/sql/ppas/11_plus/update.sql | 70 - .../triggers/sql/ppas/12_plus/count.sql | 5 - .../triggers/sql/ppas/12_plus/nodes.sql | 14 - .../triggers/sql/ppas/12_plus/properties.sql | 25 - .../triggers/sql/ppas/14_plus/create.sql | 37 - .../triggers/sql/ppas/14_plus/update.sql | 70 - .../triggers/sql/ppas/default/count.sql | 3 +- .../triggers/sql/ppas/default/create.sql | 2 +- .../triggers/sql/ppas/default/nodes.sql | 3 +- .../triggers/sql/ppas/default/properties.sql | 1 + .../triggers/sql/ppas/default/update.sql | 2 +- .../11_plus/alter_table_with_toast_table.sql | 33 - .../alter_table_with_toast_table_msql.sql | 14 - .../create_partition_table_with_collate.sql | 29 - ...eate_partition_table_with_collate_msql.sql | 19 - .../create_table_with_hash_partition.sql | 29 - .../create_table_with_hash_partition_msql.sql | 18 - .../schemas/tables/tests/pg/11_plus/test.json | 2149 --------------- .../pg/12_plus/alter_table_add_another_fk.sql | 31 - .../alter_table_add_another_fk_msql.sql | 6 - .../tests/pg/12_plus/alter_table_add_cols.sql | 20 - .../pg/12_plus/alter_table_add_cols_msql.sql | 5 - .../alter_table_add_exclude_constraint.sql | 34 - ...lter_table_add_exclude_constraint_msql.sql | 3 - ...r_table_add_null_constraint_rename_col.sql | 22 - ...le_add_null_constraint_rename_col_msql.sql | 5 - ...alter_table_add_pk_not_null_constraint.sql | 22 - ..._table_add_pk_not_null_constraint_msql.sql | 4 - .../12_plus/alter_table_add_unique_const.sql | 28 - .../alter_table_add_unique_const_msql.sql | 3 - .../alter_table_change_col_data_type.sql | 21 - .../alter_table_change_col_data_type_msql.sql | 8 - .../pg/12_plus/alter_table_delete_cols.sql | 19 - .../12_plus/alter_table_delete_cols_msql.sql | 1 - .../alter_table_delete_constraints.sql | 22 - .../alter_table_delete_constraints_msql.sql | 2 - .../pg/12_plus/alter_table_update_grants.sql | 26 - .../alter_table_update_grants_msql.sql | 7 - .../12_plus/alter_table_with_toast_table.sql | 33 - .../alter_table_with_toast_table_msql.sql | 14 - .../create_partition_table_with_collate.sql | 25 - ...eate_partition_table_with_collate_msql.sql | 16 - .../create_table_with_advanced_options.sql | 26 - ...reate_table_with_advanced_options_msql.sql | 21 - .../create_table_with_custom_autovacuum.sql | 29 - ...eate_table_with_custom_autovacuum_msql.sql | 24 - .../tests/pg/12_plus/create_table_with_fk.sql | 26 - .../pg/12_plus/create_table_with_fk_msql.sql | 21 - .../pg/12_plus/create_table_with_lik_tbl.sql | 19 - .../create_table_with_lik_tbl_msql.sql | 19 - .../12_plus/create_table_with_partition.sql | 25 - .../create_table_with_partition_msql.sql | 15 - .../tests/pg/12_plus/create_table_with_pk.sql | 18 - .../pg/12_plus/create_table_with_pk_chk.sql | 26 - .../12_plus/create_table_with_pk_chk_msql.sql | 20 - .../pg/12_plus/create_table_with_pk_msql.sql | 12 - .../create_table_with_range_partition.sql | 22 - ...create_table_with_range_partition_msql.sql | 12 - .../create_table_without_primary_key.sql | 21 - .../create_table_without_primary_key_msql.sql | 15 - .../schemas/tables/tests/pg/12_plus/test.json | 2255 ---------------- .../create_table_with_lik_tbl_msql.sql | 20 - .../14_plus/create_table_with_serial_cols.sql | 19 - .../create_table_with_serial_cols_msql.sql | 13 - .../schemas/tables/tests/pg/14_plus/test.json | 2387 ----------------- .../pg/default/alter_table_add_another_fk.sql | 4 +- .../tests/pg/default/alter_table_add_cols.sql | 4 +- .../pg/default/alter_table_add_cols_msql.sql | 4 +- .../alter_table_add_exclude_constraint.sql | 4 +- ...r_table_add_null_constraint_rename_col.sql | 4 +- .../alter_table_add_partition.sql | 0 ...alter_table_add_pk_not_null_constraint.sql | 4 +- .../default/alter_table_add_unique_const.sql | 4 +- .../alter_table_change_col_comp.sql | 0 .../alter_table_change_col_comp_msql.sql | 0 .../alter_table_change_col_data_type.sql | 4 +- .../alter_table_change_col_type_comp.sql | 0 .../alter_table_change_col_type_comp_msql.sql | 0 .../pg/default/alter_table_delete_cols.sql | 4 +- .../alter_table_delete_constraints.sql | 4 +- .../pg/default/alter_table_update_grants.sql | 2 +- .../default/alter_table_with_toast_table.sql | 2 +- .../alter_table_with_toast_table_msql.sql | 1 - .../create_partition_table_with_collate.sql | 6 +- ...eate_partition_table_with_collate_msql.sql | 5 +- .../create_table_with_advanced_options.sql | 2 +- ...reate_table_with_advanced_options_msql.sql | 2 +- .../create_table_with_column_compression.sql | 0 ...ate_table_with_column_compression_msql.sql | 0 .../create_table_with_custom_autovacuum.sql | 2 +- ...eate_table_with_custom_autovacuum_msql.sql | 2 +- .../tests/pg/default/create_table_with_fk.sql | 4 +- .../pg/default/create_table_with_fk_msql.sql | 3 - .../create_table_with_hash_partition.sql | 0 .../create_table_with_hash_partition_msql.sql | 0 .../pg/default/create_table_with_lik_tbl.sql | 4 +- .../create_table_with_lik_tbl_msql.sql | 5 +- .../default/create_table_with_partition.sql | 6 +- .../create_table_with_partition_msql.sql | 5 +- .../tests/pg/default/create_table_with_pk.sql | 4 +- .../pg/default/create_table_with_pk_chk.sql | 4 +- .../default/create_table_with_pk_chk_msql.sql | 3 - .../pg/default/create_table_with_pk_msql.sql | 3 - .../create_table_with_range_partition.sql | 6 +- ...create_table_with_range_partition_msql.sql | 5 +- .../create_table_with_serial_cols.sql | 0 .../create_table_with_serial_cols_msql.sql | 0 .../create_table_without_primary_key.sql | 4 +- .../create_table_without_primary_key_msql.sql | 3 - .../schemas/tables/tests/pg/default/test.json | 426 ++- .../11_plus/alter_table_with_toast_table.sql | 33 - .../alter_table_with_toast_table_msql.sql | 14 - .../create_partition_table_with_collate.sql | 29 - ...eate_partition_table_with_collate_msql.sql | 19 - .../create_table_with_hash_partition.sql | 29 - .../create_table_with_hash_partition_msql.sql | 18 - .../tables/tests/ppas/11_plus/test.json | 1987 -------------- .../12_plus/alter_table_add_another_fk.sql | 31 - .../alter_table_add_another_fk_msql.sql | 6 - .../ppas/12_plus/alter_table_add_cols.sql | 20 - .../12_plus/alter_table_add_cols_msql.sql | 5 - .../alter_table_add_exclude_constraint.sql | 34 - ...lter_table_add_exclude_constraint_msql.sql | 3 - ...r_table_add_null_constraint_rename_col.sql | 22 - ...le_add_null_constraint_rename_col_msql.sql | 5 - ...alter_table_add_pk_not_null_constraint.sql | 22 - ..._table_add_pk_not_null_constraint_msql.sql | 4 - .../12_plus/alter_table_add_unique_const.sql | 28 - .../alter_table_add_unique_const_msql.sql | 3 - .../alter_table_change_col_data_type.sql | 21 - .../alter_table_change_col_data_type_msql.sql | 8 - .../ppas/12_plus/alter_table_delete_cols.sql | 19 - .../12_plus/alter_table_delete_cols_msql.sql | 1 - .../alter_table_delete_constraints.sql | 22 - .../alter_table_delete_constraints_msql.sql | 2 - .../12_plus/alter_table_update_grants.sql | 26 - .../alter_table_update_grants_msql.sql | 7 - .../12_plus/alter_table_with_toast_table.sql | 33 - .../alter_table_with_toast_table_msql.sql | 14 - .../create_partition_table_with_collate.sql | 25 - ...eate_partition_table_with_collate_msql.sql | 16 - .../create_table_with_advanced_options.sql | 26 - ...reate_table_with_advanced_options_msql.sql | 21 - .../create_table_with_custom_autovacuum.sql | 29 - ...eate_table_with_custom_autovacuum_msql.sql | 24 - .../ppas/12_plus/create_table_with_fk.sql | 26 - .../12_plus/create_table_with_fk_msql.sql | 21 - .../12_plus/create_table_with_lik_tbl.sql | 19 - .../create_table_with_lik_tbl_msql.sql | 19 - .../12_plus/create_table_with_partition.sql | 25 - .../create_table_with_partition_msql.sql | 15 - .../ppas/12_plus/create_table_with_pk.sql | 18 - .../ppas/12_plus/create_table_with_pk_chk.sql | 26 - .../12_plus/create_table_with_pk_chk_msql.sql | 20 - .../12_plus/create_table_with_pk_msql.sql | 12 - .../create_table_with_range_partition.sql | 22 - ...create_table_with_range_partition_msql.sql | 12 - .../create_table_without_primary_key.sql | 21 - .../create_table_without_primary_key_msql.sql | 15 - .../tables/tests/ppas/12_plus/test.json | 2162 --------------- .../create_table_with_lik_tbl_msql.sql | 20 - .../tables/tests/ppas/14_plus/test.json | 2298 ---------------- .../default/alter_table_add_another_fk.sql | 4 +- .../ppas/default/alter_table_add_cols.sql | 4 +- .../default/alter_table_add_cols_msql.sql | 4 +- .../alter_table_add_exclude_constraint.sql | 4 +- ...r_table_add_null_constraint_rename_col.sql | 4 +- .../alter_table_add_partition.sql | 0 ...alter_table_add_pk_not_null_constraint.sql | 4 +- .../default/alter_table_add_unique_const.sql | 4 +- .../alter_table_change_col_comp.sql | 0 .../alter_table_change_col_comp_msql.sql | 0 .../alter_table_change_col_data_type.sql | 4 +- .../alter_table_change_col_type_comp.sql | 0 .../alter_table_change_col_type_comp_msql.sql | 0 .../ppas/default/alter_table_delete_cols.sql | 4 +- .../alter_table_delete_constraints.sql | 4 +- .../default/alter_table_update_grants.sql | 2 +- .../default/alter_table_with_toast_table.sql | 2 +- .../alter_table_with_toast_table_msql.sql | 1 - .../create_partition_table_with_collate.sql | 6 +- ...eate_partition_table_with_collate_msql.sql | 5 +- .../create_table_with_advanced_options.sql | 2 +- ...reate_table_with_advanced_options_msql.sql | 2 +- .../create_table_with_column_compression.sql | 0 ...ate_table_with_column_compression_msql.sql | 0 .../create_table_with_custom_autovacuum.sql | 2 +- ...eate_table_with_custom_autovacuum_msql.sql | 2 +- .../ppas/default/create_table_with_fk.sql | 4 +- .../default/create_table_with_fk_msql.sql | 3 - .../create_table_with_hash_partition.sql | 0 .../create_table_with_hash_partition_msql.sql | 0 .../default/create_table_with_lik_tbl.sql | 4 +- .../create_table_with_lik_tbl_msql.sql | 5 +- .../default/create_table_with_partition.sql | 6 +- .../create_table_with_partition_msql.sql | 5 +- .../ppas/default/create_table_with_pk.sql | 4 +- .../ppas/default/create_table_with_pk_chk.sql | 4 +- .../default/create_table_with_pk_chk_msql.sql | 3 - .../default/create_table_with_pk_msql.sql | 3 - .../create_table_with_range_partition.sql | 6 +- ...create_table_with_range_partition_msql.sql | 5 +- .../create_table_without_primary_key.sql | 4 +- .../create_table_without_primary_key_msql.sql | 3 - .../tables/tests/ppas/default/test.json | 357 ++- ...r_delete_event_trigger_with_transition.sql | 16 - ...ete_event_trigger_with_transition_msql.sql | 2 - ...r_insert_event_trigger_with_transition.sql | 16 - ...ert_event_trigger_with_transition_msql.sql | 2 - ...ter_update_event_trigger_enable_always.sql | 16 - ...pdate_event_trigger_enable_always_msql.sql | 2 - .../alter_before_insert_event_trigger.sql | 15 - ...alter_before_insert_event_trigger_msql.sql | 2 - ...re_update_event_trigger_enable_replica.sql | 16 - ...r_delete_event_trigger_with_transition.sql | 13 - ...ete_event_trigger_with_transition_msql.sql | 9 - ...r_insert_event_trigger_with_transition.sql | 13 - ...ert_event_trigger_with_transition_msql.sql | 9 - .../create_after_update_event_trigger.sql | 13 - ...create_after_update_event_trigger_msql.sql | 9 - ...eate_b4r_update_multiple_event_trigger.sql | 12 - ...b4r_update_multiple_event_trigger_msql.sql | 8 - ...reate_before_insert_event_at_statement.sql | 12 - ..._before_insert_event_at_statement_msql.sql | 8 - .../create_before_insert_event_trigger.sql | 12 - ...reate_before_insert_event_trigger_msql.sql | 8 - .../create_before_update_event_trigger.sql | 13 - ...reate_before_update_event_trigger_msql.sql | 9 - .../triggers/tests/pg/11_plus/test.json | 312 --- ...r_delete_event_trigger_with_transition.sql | 16 - ...r_insert_event_trigger_with_transition.sql | 16 - .../alter_before_insert_event_trigger.sql | 15 - ...re_update_event_trigger_enable_replica.sql | 16 - ...r_delete_event_trigger_with_transition.sql | 13 - ...ete_event_trigger_with_transition_msql.sql | 9 - ...r_insert_event_trigger_with_transition.sql | 13 - ...ert_event_trigger_with_transition_msql.sql | 9 - .../create_before_insert_event_trigger.sql | 12 - ...reate_before_insert_event_trigger_msql.sql | 8 - .../create_before_update_event_trigger.sql | 13 - .../triggers/tests/pg/14_plus/test.json | 312 --- ...r_delete_event_trigger_with_transition.sql | 2 +- ...r_insert_event_trigger_with_transition.sql | 2 +- .../alter_before_insert_event_trigger.sql | 2 +- ...re_update_event_trigger_enable_replica.sql | 2 +- ...date_event_trigger_enable_replica_msql.sql | 0 .../create_after_delete_event_trigger.sql | 0 ...create_after_delete_event_trigger_msql.sql | 0 ...r_delete_event_trigger_with_transition.sql | 2 +- ...ete_event_trigger_with_transition_msql.sql | 2 +- ...r_insert_event_trigger_with_transition.sql | 2 +- ...ert_event_trigger_with_transition_msql.sql | 2 +- ...eate_b4r_update_multiple_event_trigger.sql | 0 ...b4r_update_multiple_event_trigger_msql.sql | 0 ...reate_before_insert_event_at_statement.sql | 0 ..._before_insert_event_at_statement_msql.sql | 0 .../create_before_insert_event_trigger.sql | 2 +- ...reate_before_insert_event_trigger_msql.sql | 2 +- .../create_before_update_event_trigger.sql | 2 +- ...reate_before_update_event_trigger_msql.sql | 0 .../triggers/tests/pg/default/test.json | 26 +- ...r_delete_event_trigger_with_transition.sql | 16 - ...ete_event_trigger_with_transition_msql.sql | 2 - ...r_insert_event_trigger_with_transition.sql | 16 - ...ert_event_trigger_with_transition_msql.sql | 2 - ...ter_update_event_trigger_enable_always.sql | 16 - ...pdate_event_trigger_enable_always_msql.sql | 2 - .../alter_before_insert_event_trigger.sql | 15 - ...alter_before_insert_event_trigger_msql.sql | 2 - ...re_update_event_trigger_enable_replica.sql | 16 - ...r_delete_event_trigger_with_transition.sql | 13 - ...ete_event_trigger_with_transition_msql.sql | 9 - ...r_insert_event_trigger_with_transition.sql | 13 - ...ert_event_trigger_with_transition_msql.sql | 9 - .../create_after_update_event_trigger.sql | 13 - ...create_after_update_event_trigger_msql.sql | 9 - ...eate_b4r_update_multiple_event_trigger.sql | 12 - ...b4r_update_multiple_event_trigger_msql.sql | 8 - ...reate_before_insert_event_at_statement.sql | 12 - ..._before_insert_event_at_statement_msql.sql | 8 - .../create_before_insert_event_trigger.sql | 12 - ...reate_before_insert_event_trigger_msql.sql | 8 - .../create_before_update_event_trigger.sql | 13 - ...reate_before_update_event_trigger_msql.sql | 9 - .../triggers/tests/ppas/11_plus/test.json | 312 --- ...r_delete_event_trigger_with_transition.sql | 16 - ...r_insert_event_trigger_with_transition.sql | 16 - .../alter_before_insert_event_trigger.sql | 15 - ...re_update_event_trigger_enable_replica.sql | 16 - ...r_delete_event_trigger_with_transition.sql | 13 - ...ete_event_trigger_with_transition_msql.sql | 9 - ...r_insert_event_trigger_with_transition.sql | 13 - ...ert_event_trigger_with_transition_msql.sql | 9 - .../create_before_insert_event_trigger.sql | 12 - ...reate_before_insert_event_trigger_msql.sql | 8 - .../create_before_update_event_trigger.sql | 13 - .../triggers/tests/ppas/14_plus/test.json | 312 --- ...r_delete_event_trigger_with_transition.sql | 2 +- ...r_insert_event_trigger_with_transition.sql | 2 +- .../alter_before_insert_event_trigger.sql | 2 +- ...re_update_event_trigger_enable_replica.sql | 2 +- ...date_event_trigger_enable_replica_msql.sql | 0 .../create_after_delete_event_trigger.sql | 0 ...create_after_delete_event_trigger_msql.sql | 0 ...r_delete_event_trigger_with_transition.sql | 2 +- ...ete_event_trigger_with_transition_msql.sql | 2 +- ...r_insert_event_trigger_with_transition.sql | 2 +- ...ert_event_trigger_with_transition_msql.sql | 2 +- ...eate_b4r_update_multiple_event_trigger.sql | 0 ...b4r_update_multiple_event_trigger_msql.sql | 0 ...reate_before_insert_event_at_statement.sql | 0 ..._before_insert_event_at_statement_msql.sql | 0 .../create_before_insert_event_trigger.sql | 2 +- ...reate_before_insert_event_trigger_msql.sql | 2 +- .../create_before_update_event_trigger.sql | 2 +- ...reate_before_update_event_trigger_msql.sql | 0 .../triggers/tests/ppas/default/test.json | 20 +- .../pg/sql/14_plus/additional_properties.sql | 45 - .../templates/types/pg/sql/14_plus/create.sql | 86 - .../templates/types/pg/sql/14_plus/nodes.sql | 19 - .../types/pg/sql/14_plus/properties.sql | 45 - .../templates/types/pg/sql/14_plus/update.sql | 183 -- .../pg/sql/default/additional_properties.sql | 3 +- .../templates/types/pg/sql/default/create.sql | 6 +- .../templates/types/pg/sql/default/nodes.sql | 3 +- .../types/pg/sql/default/properties.sql | 2 + .../templates/types/pg/sql/default/update.sql | 5 +- .../sql/14_plus/additional_properties.sql | 64 - .../types/ppas/sql/14_plus/create.sql | 96 - .../types/ppas/sql/14_plus/nodes.sql | 19 - .../types/ppas/sql/14_plus/properties.sql | 45 - .../types/ppas/sql/14_plus/update.sql | 183 -- .../sql/default/additional_properties.sql | 3 +- .../types/ppas/sql/default/create.sql | 6 +- .../types/ppas/sql/default/nodes.sql | 3 +- .../types/ppas/sql/default/properties.sql | 2 + .../types/ppas/sql/default/update.sql | 5 +- .../pg/14_plus/alter_acl_grantee_change.sql | 18 - .../alter_range_type_acl_description.sql | 20 - .../tests/pg/14_plus/create_range_type.sql | 13 - .../schemas/types/tests/pg/14_plus/tests.json | 439 --- .../pg/default/alter_acl_grantee_change.sql | 3 +- .../alter_range_type_acl_description.sql | 3 +- .../create_multi_range_type.msql | 0 .../create_multi_range_type.sql | 0 .../tests/pg/default/create_range_type.sql | 3 +- .../schemas/types/tests/pg/default/tests.json | 28 + .../ppas/14_plus/alter_acl_grantee_change.sql | 18 - .../alter_range_type_acl_description.sql | 20 - .../tests/ppas/14_plus/create_range_type.sql | 13 - .../types/tests/ppas/14_plus/tests.json | 324 --- .../ppas/default/alter_acl_grantee_change.sql | 5 +- .../alter_range_type_acl_description.sql | 3 +- .../create_multi_range_type.msql | 0 .../create_multi_range_type.sql | 0 .../tests/ppas/default/create_range_type.sql | 3 +- .../types/tests/ppas/default/tests.json | 68 +- .../mviews/pg/12_plus/sql/create.sql | 52 - .../mviews/pg/12_plus/sql/properties.sql | 114 - .../mviews/pg/12_plus/sql/update.sql | 226 -- .../mviews/pg/13_plus/sql/create.sql | 59 - .../mviews/pg/13_plus/sql/properties.sql | 120 - .../mviews/pg/13_plus/sql/update.sql | 240 -- .../mviews/pg/default/sql/create.sql | 12 + .../sql/create_access_method.sql | 0 .../sql/get_access_methods.sql | 0 .../mviews/pg/default/sql/properties.sql | 11 +- .../mviews/pg/default/sql/update.sql | 35 +- .../mviews/ppas/12_plus/sql/create.sql | 50 - .../mviews/ppas/12_plus/sql/properties.sql | 112 - .../mviews/ppas/12_plus/sql/update.sql | 207 -- .../mviews/ppas/13_plus/sql/create.sql | 57 - .../mviews/ppas/13_plus/sql/properties.sql | 118 - .../mviews/ppas/13_plus/sql/update.sql | 221 -- .../mviews/ppas/default/sql/create.sql | 12 + .../sql/get_access_methods.sql | 0 .../mviews/ppas/default/sql/properties.sql | 11 +- .../mviews/ppas/default/sql/update.sql | 17 + .../views/tests/pg/12_plus/test_mview.json | 279 -- .../schemas/views/tests/pg/12_plus/tests.json | 244 -- .../views/tests/pg/13_plus/test_mview.json | 345 --- .../alter_mview_no_depends.msql | 0 .../alter_mview_no_depends.sql | 0 .../create_mview_no_depends.msql | 0 .../create_mview_no_depends.sql | 0 .../create_mview_with_am.sql | 0 .../create_mview_with_am_msql.sql | 0 .../views/tests/pg/default/test_mview.json | 86 + .../views/tests/ppas/12_plus/test_mview.json | 280 -- .../views/tests/ppas/12_plus/tests.json | 206 -- .../views/tests/ppas/13_plus/test_mview.json | 340 --- .../alter_mview_no_depends.msql | 0 .../alter_mview_no_depends.sql | 0 .../create_mview_no_depends.msql | 0 .../create_mview_no_depends.sql | 0 .../create_mview_with_am.sql | 0 .../create_mview_with_am_msql.sql | 0 .../views/tests/ppas/default/test_mview.json | 579 ++-- .../views/tests/ppas/default/tests.json | 379 +-- .../subscriptions/sql/14_plus/create.sql | 24 - .../subscriptions/sql/14_plus/properties.sql | 29 - .../subscriptions/sql/14_plus/update.sql | 65 - .../subscriptions/sql/default/create.sql | 2 +- .../subscriptions/sql/default/properties.sql | 2 + .../subscriptions/sql/default/update.sql | 20 +- .../tests/14_plus/create_subscription.sql | 8 - .../14_plus/create_subscription_msql.sql | 4 - .../subscriptions/tests/14_plus/test.json | 57 - .../{14_plus => default}/alter_parameters.sql | 0 .../alter_parameters_msql.sql | 0 .../tests/default/create_subscription.sql | 6 +- .../default/create_subscription_msql.sql | 6 +- .../subscriptions/tests/default/test.json | 45 +- .../depends/pg/11_plus/dependencies.sql | 89 - .../depends/pg/11_plus/dependents.sql | 75 - .../depends/pg/12_plus/dependencies.sql | 89 - .../depends/pg/12_plus/dependents.sql | 75 - .../depends/pg/default/dependencies.sql | 6 +- .../depends/pg/default/dependents.sql | 4 +- .../depends/ppas/11_plus/dependencies.sql | 93 - .../depends/ppas/11_plus/dependents.sql | 79 - .../depends/ppas/12_plus/dependencies.sql | 93 - .../depends/ppas/12_plus/dependents.sql | 79 - .../depends/ppas/default/dependencies.sql | 10 +- .../depends/ppas/default/dependents.sql | 8 +- .../sqlautocomplete/sql/11_plus/functions.sql | 18 - .../sqlautocomplete/sql/default/functions.sql | 4 +- .../erd/tests/sql/12_plus/test_sql_output.sql | 25 - .../erd/tests/sql/default/test_sql_output.sql | 11 +- .../grant_wizard/pg/11_plus/sql/function.sql | 26 - .../grant_wizard/pg/default/sql/function.sql | 8 +- .../ppas/11_plus/sql/function.sql | 27 - .../grant_wizard/ppas/12_plus/sql/package.sql | 15 - .../ppas/default/sql/function.sql | 4 +- .../grant_wizard/ppas/default/sql/package.sql | 1 + .../schema_diff/tests/pg/11_plus/source.sql | 1160 -------- .../schema_diff/tests/pg/11_plus/target.sql | 1109 -------- .../tests/pg/{12_plus => default}/source.sql | 0 .../tests/pg/{12_plus => default}/target.sql | 0 .../ppas/{11_plus => default}/source.sql | 0 .../ppas/{11_plus => default}/target.sql | 0 .../search_objects/sql/pg/11_plus/search.sql | 560 ---- .../search_objects/sql/pg/default/search.sql | 38 +- .../sql/ppas/11_plus/search.sql | 621 ----- .../sql/ppas/12_plus/search.sql | 630 ----- .../sql/ppas/default/search.sql | 25 +- .../sqleditor/sql/11_plus/primary_keys.sql | 19 - .../sqleditor/sql/12_plus/explain_plan.sql | 18 - .../sqleditor/sql/13_plus/explain_plan.sql | 20 - .../sqleditor/sql/default/explain_plan.sql | 4 + .../sqleditor/sql/default/primary_keys.sql | 2 +- .../tests/test_explain_plan_templates.py | 10 +- 1319 files changed, 4650 insertions(+), 52311 deletions(-) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/properties.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/{13_plus => default}/alter_collation.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/{13_plus => default}/create_collation.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/{13_plus => default}/create_collation_with_extra_params.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/{13_plus => default}/create_collation_with_libc.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/{13_plus => default}/msql_collation.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/{13_plus => default}/test.json (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/alter_column_timestamp_with_default_value_using_function.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/alter_column_timestamp_with_default_value_using_function.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/alter_column_with_integer_generated_always_column_option_variables.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/alter_column_with_integer_generated_always_column_option_variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/create_column_timestamp_with_default_value_using_function.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/create_column_timestamp_with_default_value_using_function.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/create_column_with_integer_generated_always_column_option_variables.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/{12_plus => default}/create_column_with_integer_generated_always_column_option_variables.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/alter_column_timestamp_with_default_value_using_function.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/alter_column_timestamp_with_default_value_using_function.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/alter_column_with_integer_generated_always_column_option_variables.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/alter_column_with_integer_generated_always_column_option_variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/create_column_timestamp_with_default_value_using_function.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/create_column_timestamp_with_default_value_using_function.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/create_column_with_integer_generated_always_column_option_variables.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/{12_plus => default}/create_column_with_integer_generated_always_column_option_variables.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_columns.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_constraints.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/coll_stats.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_definition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/{12_plus => default}/get_support_functions.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/coll_stats.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_definition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/{12_plus => default}/get_support_functions.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/count.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/count.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{14_plus => default}/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{14_plus => default}/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{14_plus => default}/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/{11_plus => default}/variables.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/coll_stats.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_definition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/coll_stats.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/delete.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_definition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/node.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/coll_stats.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/delete.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_definition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/node.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_param.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_1.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_2.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_3.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_event_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_procedure.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_trigger_functions.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_add_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_change_grantee_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_delete_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_1.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_2.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_3.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_event_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_trigger_functions.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_proc_no_depends.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_add_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_trigger_functions.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{12_plus => default}/alter_func_remove_partial_pri.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{12_plus => default}/alter_func_remove_partial_pri.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{13_plus => default}/alter_function_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{13_plus => default}/alter_function_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{12_plus => default}/alter_proc_add_priv.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/alter_proc_add_priv.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{12_plus => default}/alter_proc_change_grantee_priv.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/alter_proc_change_grantee_priv.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/alter_proc_comment.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{11_plus => default}/alter_proc_comment_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{12_plus => default}/alter_proc_delete_priv.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/alter_proc_delete_priv.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{13_plus => default}/alter_proc_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/alter_proc_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/alter_proc_param.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{11_plus => default}/alter_proc_param_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_atomic_func.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_atomic_func.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_atomic_proc.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_atomic_proc.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{13_plus => default}/create_function_on_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{13_plus => default}/create_function_on_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_procedure.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_procedure.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_procedure_on_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/create_procedure_on_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/{14_plus => default}/test_procedures.json (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_1.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_2.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_3.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_event_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_procedure.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_trigger_functions.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_add_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_1.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_2.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_3.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_event_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger_full.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_trigger_functions.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_add_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_change_grantee_priv.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_delete_priv.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_no_depends.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_param.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_function.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_procedures.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_trigger_functions.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{12_plus => default}/alter_func_remove_partial_pri.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{12_plus => default}/alter_func_remove_partial_pri.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{13_plus => default}/alter_function_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{13_plus => default}/alter_function_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{12_plus => default}/alter_proc_add_priv.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/alter_proc_add_priv.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/{pg/14_plus => ppas/default}/alter_proc_delete_priv.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/alter_proc_delete_priv.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/{pg/14_plus => ppas/default}/alter_proc_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/alter_proc_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_atomic_func.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_atomic_func.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_atomic_proc.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_atomic_proc.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{13_plus => default}/create_function_on_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{13_plus => default}/create_function_on_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_procedure.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_procedure_on_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/{14_plus => default}/create_procedure_on_depends.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/get_oid.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{14_plus => default}/alter_column_compression.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{14_plus => default}/alter_column_compression.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/alter_column_generated.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/alter_column_generated.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/alter_column_generated_with_existing_columns.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/alter_column_generated_with_existing_columns.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{14_plus => default}/create_column_comp.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{14_plus => default}/create_column_comp.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/create_column_int_generated.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/create_column_int_generated.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/create_column_int_generated_with_existing_columns.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/{12_plus => default}/create_column_int_generated_with_existing_columns.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.msql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{14_plus => default}/alter_column_compression.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{14_plus => default}/alter_column_compression.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/alter_column_generated.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/alter_column_generated.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/alter_column_generated_with_existing_columns.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/alter_column_generated_with_existing_columns.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/alter_column_timestamp_with_default_value_using_function.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/alter_column_timestamp_with_default_value_using_function.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/alter_column_with_interger_array_and_options.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/alter_column_with_interger_array_and_options.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{14_plus => default}/create_column_comp.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{14_plus => default}/create_column_comp.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/create_column_int_generated.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/create_column_int_generated.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/create_column_int_generated_with_existing_columns.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/{12_plus => default}/create_column_int_generated_with_existing_columns.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/create_column_text_with_default_value.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/create_column_text_with_default_value.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/create_column_timestamp_with_default_value_using_function.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/create_column_timestamp_with_default_value_using_function.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/create_column_with_interger_array_and_options.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/{pg/12_plus => ppas/default}/create_column_with_interger_array_and_options.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/{12_plus => default}/alter_event_comment_code.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/{12_plus => default}/create_for_all_event.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/{12_plus => default}/create_for_insert_delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/{12_plus => default}/create_for_insert_update_on_columns.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/{12_plus => default}/create_for_insert_with_when.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/{12_plus => default}/test.json (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/{11_plus => default}/create_exclusion_constraint_exp_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_primary_key.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_unique_constraint.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_expr_statistics.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_name_fillfactor_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_reset_fillfactor_cluster.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/test_indexes.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_expr_statistics.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_name_fillfactor_comment.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_reset_fillfactor_cluster.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_first.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_expr_asc_null_last.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/test_indexes.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/{11_plus => default}/alter_expr_statistics_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/{13_plus => default}/alter_index_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/{13_plus => default}/alter_index_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/{13_plus => default}/create_index_with_ext.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/{13_plus => default}/create_index_with_ext.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/test_partitions.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/test_partitions.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_select_policy.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_simple_insert_policy.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_update_policy_with_check_and_using.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/create_delete_policy_with_using.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/count.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/enable_disable_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/get_columns.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/get_parent.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/{12_plus => default}/update.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/properties.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/{11_plus => default}/get_constraint_include.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/properties.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/{11_plus => default}/get_constraint_include.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/column_details.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/{11_plus => default}/include_details.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/11_plus/partition_diff.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/14_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/11_plus/partition_diff.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/14_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/{12_plus => default}/get_access_methods.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/{11_plus => default}/get_collation.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/count.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_lik_tbl_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{12_plus => default}/alter_table_add_partition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{14_plus => default}/alter_table_change_col_comp.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{14_plus => default}/alter_table_change_col_comp_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{14_plus => default}/alter_table_change_col_type_comp.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{14_plus => default}/alter_table_change_col_type_comp_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{14_plus => default}/create_table_with_column_compression.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{14_plus => default}/create_table_with_column_compression_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{12_plus => default}/create_table_with_hash_partition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{12_plus => default}/create_table_with_hash_partition_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{12_plus => default}/create_table_with_serial_cols.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/{12_plus => default}/create_table_with_serial_cols_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_lik_tbl_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{12_plus => default}/alter_table_add_partition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{14_plus => default}/alter_table_change_col_comp.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{14_plus => default}/alter_table_change_col_comp_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{14_plus => default}/alter_table_change_col_type_comp.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{14_plus => default}/alter_table_change_col_type_comp_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{14_plus => default}/create_table_with_column_compression.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{14_plus => default}/create_table_with_column_compression_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{12_plus => default}/create_table_with_hash_partition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/{12_plus => default}/create_table_with_hash_partition_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_update_event_trigger_enable_replica.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_update_event_trigger_enable_replica.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_update_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{11_plus => default}/alter_before_update_event_trigger_enable_replica_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{11_plus => default}/create_after_delete_event_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{11_plus => default}/create_after_delete_event_trigger_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{14_plus => default}/create_b4r_update_multiple_event_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{14_plus => default}/create_b4r_update_multiple_event_trigger_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{14_plus => default}/create_before_insert_event_at_statement.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{14_plus => default}/create_before_insert_event_at_statement_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/{14_plus => default}/create_before_update_event_trigger_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_update_event_trigger_enable_replica.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/test.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_update_event_trigger_enable_replica.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_update_event_trigger.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{11_plus => default}/alter_before_update_event_trigger_enable_replica_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{11_plus => default}/create_after_delete_event_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{11_plus => default}/create_after_delete_event_trigger_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{14_plus => default}/create_b4r_update_multiple_event_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{14_plus => default}/create_b4r_update_multiple_event_trigger_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{14_plus => default}/create_before_insert_event_at_statement.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{14_plus => default}/create_before_insert_event_at_statement_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/{14_plus => default}/create_before_update_event_trigger_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/additional_properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/additional_properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_acl_grantee_change.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_range_type_acl_description.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_range_type.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/tests.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/{14_plus => default}/create_multi_range_type.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/{14_plus => default}/create_multi_range_type.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_acl_grantee_change.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_range_type_acl_description.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_range_type.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/tests.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/{14_plus => default}/create_multi_range_type.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/{14_plus => default}/create_multi_range_type.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/{12_plus => default}/sql/create_access_method.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/{12_plus => default}/sql/get_access_methods.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/{12_plus => default}/sql/get_access_methods.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/test_mview.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/tests.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/test_mview.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/{13_plus => default}/alter_mview_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/{13_plus => default}/alter_mview_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/{13_plus => default}/create_mview_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/{13_plus => default}/create_mview_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/{12_plus => default}/create_mview_with_am.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/{12_plus => default}/create_mview_with_am_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/test_mview.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/tests.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/test_mview.json rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/{13_plus => default}/alter_mview_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/{13_plus => default}/alter_mview_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/{13_plus => default}/create_mview_no_depends.msql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/{13_plus => default}/create_mview_no_depends.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/{12_plus => default}/create_mview_with_am.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/{12_plus => default}/create_mview_with_am_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription_msql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/test.json rename web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/{14_plus => default}/alter_parameters.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/{14_plus => default}/alter_parameters_msql.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependents.sql delete mode 100644 web/pgadmin/misc/templates/sqlautocomplete/sql/11_plus/functions.sql delete mode 100644 web/pgadmin/tools/erd/tests/sql/12_plus/test_sql_output.sql delete mode 100644 web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/11_plus/sql/function.sql delete mode 100644 web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/11_plus/sql/function.sql delete mode 100644 web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/12_plus/sql/package.sql delete mode 100644 web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql delete mode 100644 web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql rename web/pgadmin/tools/schema_diff/tests/pg/{12_plus => default}/source.sql (100%) rename web/pgadmin/tools/schema_diff/tests/pg/{12_plus => default}/target.sql (100%) rename web/pgadmin/tools/schema_diff/tests/ppas/{11_plus => default}/source.sql (100%) rename web/pgadmin/tools/schema_diff/tests/ppas/{11_plus => default}/target.sql (100%) delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql delete mode 100644 web/pgadmin/tools/sqleditor/templates/sqleditor/sql/11_plus/primary_keys.sql delete mode 100644 web/pgadmin/tools/sqleditor/templates/sqleditor/sql/12_plus/explain_plan.sql delete mode 100644 web/pgadmin/tools/sqleditor/templates/sqleditor/sql/13_plus/explain_plan.sql diff --git a/docs/en_US/release_notes_9_16.rst b/docs/en_US/release_notes_9_16.rst index 4f0740cdff0..004932ba0a0 100644 --- a/docs/en_US/release_notes_9_16.rst +++ b/docs/en_US/release_notes_9_16.rst @@ -14,9 +14,9 @@ This release contains a number of bug fixes and new features since the release o Supported Database Servers ************************** -**PostgreSQL**: 13, 14, 15, 16, 17 and 18 +**PostgreSQL**: 14, 15, 16, 17 and 18 -**EDB Advanced Server**: 13, 14, 15, 16, 17 and 18 +**EDB Advanced Server**: 14, 15, 16, 17 and 18 Bundled PostgreSQL Utilities **************************** @@ -35,6 +35,7 @@ Housekeeping | `Issue #9981 `_ - Clarify the SSH tunnel "Prompt for identity file password?" switch label and help text to indicate it applies only to identity-file authentication. | `Issue #10018 `_ - Remove the EDB BigAnimal cloud deployment support. + | `Issue #10050 `_ - Rebase the version-specific SQL templates so the default targets PostgreSQL 14, the oldest supported server version, dropping the obsolete sub-14 template buckets. Bug fixes ********* diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/create.sql deleted file mode 100644 index babd09faac4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/create.sql +++ /dev/null @@ -1,20 +0,0 @@ -{% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} -{% set add_comma_after_insert = 'insert' %} -{% endif %} -{% if data.evnt_truncate %} -{% set add_comma_after_delete = 'delete' %} -{% endif %} -{% if data.evnt_delete or data.evnt_truncate%} -{% set add_comma_after_update = 'update' %} -{% endif %} -{### Create PUBLICATION ###} -CREATE PUBLICATION {{ conn|qtIdent(data.name) }} -{% if data.all_table %} - FOR ALL TABLES -{% elif data.pubtable %} - FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %} - -{% endif %} -{% if data.evnt_insert or data.evnt_update or data.evnt_delete or data.evnt_truncate %} - WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}'); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/properties.sql deleted file mode 100644 index 00b4d4e1e49..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/11_plus/sql/properties.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT c.oid AS oid, c.pubname AS name, -pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, pubtruncate AS evnt_truncate, -puballtables AS all_table, -pga.rolname AS pubowner FROM pg_catalog.pg_publication c -JOIN pg_catalog.pg_roles pga ON c.pubowner= pga.oid -{% if pbid %} - WHERE c.oid = {{ pbid }} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/create.sql deleted file mode 100644 index 4f574127ebe..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/create.sql +++ /dev/null @@ -1,23 +0,0 @@ -{% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} -{% set add_comma_after_insert = 'insert' %} -{% endif %} -{% if data.evnt_truncate %} -{% set add_comma_after_delete = 'delete' %} -{% endif %} -{% if data.evnt_delete or data.evnt_truncate%} -{% set add_comma_after_update = 'update' %} -{% endif %} -{% if data.publish_via_partition_root%} -{% set add_comma_after_truncate = 'truncate' %} -{% endif %} -{### Create PUBLICATION ###} -CREATE PUBLICATION {{ conn|qtIdent(data.name) }} -{% if data.all_table %} - FOR ALL TABLES -{% elif data.pubtable %} - FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %} - -{% endif %} -{% if data.evnt_insert or data.evnt_update or data.evnt_delete or data.evnt_truncate %} - WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}', publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/properties.sql deleted file mode 100644 index 186aeb27999..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/properties.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT c.oid AS oid, c.pubname AS name, -pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, pubtruncate AS evnt_truncate, -puballtables AS all_table, -pubviaroot AS publish_via_partition_root, -pga.rolname AS pubowner FROM pg_catalog.pg_publication c -JOIN pg_catalog.pg_roles pga ON c.pubowner= pga.oid -{% if pbid %} - WHERE c.oid = {{ pbid }} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/update.sql deleted file mode 100644 index 4995d92b70f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/13_plus/sql/update.sql +++ /dev/null @@ -1,48 +0,0 @@ -{% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} -{% set add_comma_after_insert = 'insert' %} -{% endif %} -{% if data.evnt_truncate %} -{% set add_comma_after_delete = 'delete' %} -{% endif %} -{% if data.evnt_delete or data.evnt_truncate%} -{% set add_comma_after_update = 'update' %} -{% endif %} -{### Alter publication owner ###} -{% if data.pubowner %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - OWNER TO {{ conn|qtIdent(data.pubowner) }}; - -{% endif %} -{### Alter publication event ###} -{% if (data.evnt_insert is defined and data.evnt_insert != o_data.evnt_insert) or (data.evnt_update is defined and data.evnt_update != o_data.evnt_update) or (data.evnt_delete is defined and data.evnt_delete != o_data.evnt_delete) or (data.evnt_truncate is defined and data.evnt_truncate != o_data.evnt_truncate) %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET - (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}'); - -{% endif %} -{### Alter publication partition root ###} -{% if data.publish_via_partition_root is defined and data.publish_via_partition_root != o_data.publish_via_partition_root%} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET - (publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); - -{% endif %} -{### Alter drop publication table ###} -{% if drop_table %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - DROP TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in drop_table_data %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %}; - -{% endif %} -{### Alter publication table ###} -{% if add_table %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - ADD TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in add_table_data %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %}; - -{% endif %} -{### Alter publication name ###} -{% if data.name != o_data.name %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; -{% endif %} - - - - diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/create.sql index 4eb493f1676..4f574127ebe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/create.sql @@ -1,16 +1,23 @@ {% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} {% set add_comma_after_insert = 'insert' %} {% endif %} +{% if data.evnt_truncate %} +{% set add_comma_after_delete = 'delete' %} +{% endif %} {% if data.evnt_delete or data.evnt_truncate%} {% set add_comma_after_update = 'update' %} {% endif %} +{% if data.publish_via_partition_root%} +{% set add_comma_after_truncate = 'truncate' %} +{% endif %} +{### Create PUBLICATION ###} CREATE PUBLICATION {{ conn|qtIdent(data.name) }} {% if data.all_table %} FOR ALL TABLES {% elif data.pubtable %} - FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{pub_table}}{% endfor %} + FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %} {% endif %} {% if data.evnt_insert or data.evnt_update or data.evnt_delete or data.evnt_truncate %} - WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% endif %}'); + WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}', publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/properties.sql index 8be36e1a847..186aeb27999 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/properties.sql @@ -1,8 +1,9 @@ SELECT c.oid AS oid, c.pubname AS name, -pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, +pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, pubtruncate AS evnt_truncate, puballtables AS all_table, +pubviaroot AS publish_via_partition_root, pga.rolname AS pubowner FROM pg_catalog.pg_publication c JOIN pg_catalog.pg_roles pga ON c.pubowner= pga.oid {% if pbid %} - where c.oid = {{ pbid }} + WHERE c.oid = {{ pbid }} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/update.sql index 0593ec409e9..4995d92b70f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/pg/default/sql/update.sql @@ -18,6 +18,12 @@ ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}'); +{% endif %} +{### Alter publication partition root ###} +{% if data.publish_via_partition_root is defined and data.publish_via_partition_root != o_data.publish_via_partition_root%} +ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET + (publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); + {% endif %} {### Alter drop publication table ###} {% if drop_table %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/create.sql deleted file mode 100644 index babd09faac4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/create.sql +++ /dev/null @@ -1,20 +0,0 @@ -{% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} -{% set add_comma_after_insert = 'insert' %} -{% endif %} -{% if data.evnt_truncate %} -{% set add_comma_after_delete = 'delete' %} -{% endif %} -{% if data.evnt_delete or data.evnt_truncate%} -{% set add_comma_after_update = 'update' %} -{% endif %} -{### Create PUBLICATION ###} -CREATE PUBLICATION {{ conn|qtIdent(data.name) }} -{% if data.all_table %} - FOR ALL TABLES -{% elif data.pubtable %} - FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %} - -{% endif %} -{% if data.evnt_insert or data.evnt_update or data.evnt_delete or data.evnt_truncate %} - WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}'); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/properties.sql deleted file mode 100644 index 00b4d4e1e49..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/11_plus/sql/properties.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT c.oid AS oid, c.pubname AS name, -pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, pubtruncate AS evnt_truncate, -puballtables AS all_table, -pga.rolname AS pubowner FROM pg_catalog.pg_publication c -JOIN pg_catalog.pg_roles pga ON c.pubowner= pga.oid -{% if pbid %} - WHERE c.oid = {{ pbid }} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/create.sql deleted file mode 100644 index 4f574127ebe..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/create.sql +++ /dev/null @@ -1,23 +0,0 @@ -{% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} -{% set add_comma_after_insert = 'insert' %} -{% endif %} -{% if data.evnt_truncate %} -{% set add_comma_after_delete = 'delete' %} -{% endif %} -{% if data.evnt_delete or data.evnt_truncate%} -{% set add_comma_after_update = 'update' %} -{% endif %} -{% if data.publish_via_partition_root%} -{% set add_comma_after_truncate = 'truncate' %} -{% endif %} -{### Create PUBLICATION ###} -CREATE PUBLICATION {{ conn|qtIdent(data.name) }} -{% if data.all_table %} - FOR ALL TABLES -{% elif data.pubtable %} - FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %} - -{% endif %} -{% if data.evnt_insert or data.evnt_update or data.evnt_delete or data.evnt_truncate %} - WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}', publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/properties.sql deleted file mode 100644 index 186aeb27999..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/properties.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT c.oid AS oid, c.pubname AS name, -pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, pubtruncate AS evnt_truncate, -puballtables AS all_table, -pubviaroot AS publish_via_partition_root, -pga.rolname AS pubowner FROM pg_catalog.pg_publication c -JOIN pg_catalog.pg_roles pga ON c.pubowner= pga.oid -{% if pbid %} - WHERE c.oid = {{ pbid }} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/update.sql deleted file mode 100644 index 4995d92b70f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/13_plus/sql/update.sql +++ /dev/null @@ -1,48 +0,0 @@ -{% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} -{% set add_comma_after_insert = 'insert' %} -{% endif %} -{% if data.evnt_truncate %} -{% set add_comma_after_delete = 'delete' %} -{% endif %} -{% if data.evnt_delete or data.evnt_truncate%} -{% set add_comma_after_update = 'update' %} -{% endif %} -{### Alter publication owner ###} -{% if data.pubowner %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - OWNER TO {{ conn|qtIdent(data.pubowner) }}; - -{% endif %} -{### Alter publication event ###} -{% if (data.evnt_insert is defined and data.evnt_insert != o_data.evnt_insert) or (data.evnt_update is defined and data.evnt_update != o_data.evnt_update) or (data.evnt_delete is defined and data.evnt_delete != o_data.evnt_delete) or (data.evnt_truncate is defined and data.evnt_truncate != o_data.evnt_truncate) %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET - (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}'); - -{% endif %} -{### Alter publication partition root ###} -{% if data.publish_via_partition_root is defined and data.publish_via_partition_root != o_data.publish_via_partition_root%} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET - (publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); - -{% endif %} -{### Alter drop publication table ###} -{% if drop_table %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - DROP TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in drop_table_data %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %}; - -{% endif %} -{### Alter publication table ###} -{% if add_table %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - ADD TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in add_table_data %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %}; - -{% endif %} -{### Alter publication name ###} -{% if data.name != o_data.name %} -ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; -{% endif %} - - - - diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/create.sql index 4eb493f1676..4f574127ebe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/create.sql @@ -1,16 +1,23 @@ {% if data.evnt_delete or data.evnt_update or data.evnt_truncate %} {% set add_comma_after_insert = 'insert' %} {% endif %} +{% if data.evnt_truncate %} +{% set add_comma_after_delete = 'delete' %} +{% endif %} {% if data.evnt_delete or data.evnt_truncate%} {% set add_comma_after_update = 'update' %} {% endif %} +{% if data.publish_via_partition_root%} +{% set add_comma_after_truncate = 'truncate' %} +{% endif %} +{### Create PUBLICATION ###} CREATE PUBLICATION {{ conn|qtIdent(data.name) }} {% if data.all_table %} FOR ALL TABLES {% elif data.pubtable %} - FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{pub_table}}{% endfor %} + FOR TABLE {% if data.only_table%}ONLY {% endif %}{% for pub_table in data.pubtable %}{% if loop.index != 1 %}, {% endif %}{{ pub_table }}{% endfor %} {% endif %} {% if data.evnt_insert or data.evnt_update or data.evnt_delete or data.evnt_truncate %} - WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% endif %}'); + WITH (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}', publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/properties.sql index 8be36e1a847..186aeb27999 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/properties.sql @@ -1,8 +1,9 @@ SELECT c.oid AS oid, c.pubname AS name, -pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, +pubinsert AS evnt_insert, pubupdate AS evnt_update, pubdelete AS evnt_delete, pubtruncate AS evnt_truncate, puballtables AS all_table, +pubviaroot AS publish_via_partition_root, pga.rolname AS pubowner FROM pg_catalog.pg_publication c JOIN pg_catalog.pg_roles pga ON c.pubowner= pga.oid {% if pbid %} - where c.oid = {{ pbid }} + WHERE c.oid = {{ pbid }} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/update.sql index 0593ec409e9..4995d92b70f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/ppas/default/sql/update.sql @@ -18,6 +18,12 @@ ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET (publish = '{% if data.evnt_insert %}insert{% if add_comma_after_insert == 'insert' %}, {% endif %}{% endif %}{% if data.evnt_update %}update{% if add_comma_after_update == 'update' %}, {% endif %}{% endif %}{% if data.evnt_delete %}delete{% if add_comma_after_delete == 'delete' %}, {% endif %}{% endif %}{% if data.evnt_truncate %}truncate{% endif %}'); +{% endif %} +{### Alter publication partition root ###} +{% if data.publish_via_partition_root is defined and data.publish_via_partition_root != o_data.publish_via_partition_root%} +ALTER PUBLICATION {{ conn|qtIdent(o_data.name) }} SET + (publish_via_partition_root = {{ data.publish_via_partition_root|lower }}); + {% endif %} {### Alter drop publication table ###} {% if drop_table %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication.sql deleted file mode 100644 index 90cd91e0fa3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: alterd_publication - --- DROP PUBLICATION IF EXISTS alterd_publication; - -CREATE PUBLICATION alterd_publication - FOR ALL TABLES - WITH (publish = 'insert, update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables.sql deleted file mode 100644 index 6a568e37897..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: test_publication_create - --- DROP PUBLICATION IF EXISTS test_publication_create; - -CREATE PUBLICATION test_publication_create - FOR TABLE public.test_table_publication, public.test_table_publication_2 - WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables_msql.sql deleted file mode 100644 index 85a57af080e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_add_tables_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PUBLICATION test_publication_create - ADD TABLE public.test_table_publication_2; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables.sql deleted file mode 100644 index 917913dab2f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: test_publication_create - --- DROP PUBLICATION IF EXISTS test_publication_create; - -CREATE PUBLICATION test_publication_create - FOR TABLE public.test_table_publication_2 - WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables_msql.sql deleted file mode 100644 index 0978c49a3ea..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_drop_tables_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PUBLICATION test_publication_create - DROP TABLE public.test_table_publication; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event.sql deleted file mode 100644 index 10b089fe77e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: alterd_publication - --- DROP PUBLICATION IF EXISTS alterd_publication; - -CREATE PUBLICATION alterd_publication - FOR ALL TABLES - WITH (publish = 'insert, update, delete', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event_msql.sql deleted file mode 100644 index 5000a11a985..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PUBLICATION alterd_publication SET - (publish = 'insert, update, delete'); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_msql.sql deleted file mode 100644 index f799b60df54..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PUBLICATION test_publication_create - RENAME TO alterd_publication; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication.sql deleted file mode 100644 index 8c087442efc..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: test_publication_create - --- DROP PUBLICATION IF EXISTS test_publication_create; - -CREATE PUBLICATION test_publication_create - FOR ALL TABLES - WITH (publish = 'insert, update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables.sql deleted file mode 100644 index f1713b9b1d1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: test_publication_create - --- DROP PUBLICATION IF EXISTS test_publication_create; - -CREATE PUBLICATION test_publication_create - FOR TABLE public.test_table_publication - WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables_msql.sql deleted file mode 100644 index 63e7e8b5194..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_few_tables_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE PUBLICATION test_publication_create - FOR TABLE public.test_table_publication - WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_msql.sql deleted file mode 100644 index 948ab8f7a50..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE PUBLICATION test_publication_create - FOR ALL TABLES - WITH (publish = 'insert, update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update.sql deleted file mode 100644 index 70b985c9c16..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Publication: test_publication_with_update - --- DROP PUBLICATION test_publication_with_update; - -CREATE PUBLICATION test_publication_with_update - FOR ALL TABLES - WITH (publish = 'update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update_msql.sql deleted file mode 100644 index 4378accc104..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication_update_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE PUBLICATION test_publication_with_update - FOR ALL TABLES - WITH (publish = 'update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/test.json deleted file mode 100644 index 64c0d0fe95c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/test.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table For publication", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_table_publication", - "columns": [ - { - "name": "emp_id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - }, - { - "name": "salary", - "cltype": "bigint" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Second Table For Publication", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_table_publication_2", - "columns": [ - { - "name": "dept_id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "dept_name", - "cltype": "text" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Publication", - "endpoint": "NODE-publication.obj", - "sql_endpoint": "NODE-publication.sql_id", - "msql_endpoint": "NODE-publication.msql", - "data": { - "name": "test_publication_create", - "evnt_insert": true, - "evnt_update": true, - "evnt_delete": false, - "evnt_truncate": false, - "pubowner": "", - "publish_via_partition_root": false, - "all_table": true, - "pubtable": "" - }, - "expected_sql_file": "create_publication.sql", - "expected_msql_file": "create_publication_msql.sql" - }, - { - "type": "alter", - "name": "Alter Publication name", - "endpoint": "NODE-publication.obj_id", - "sql_endpoint": "NODE-publication.sql_id", - "msql_endpoint": "NODE-publication.msql_id", - "data": { - "name": "alterd_publication" - }, - "expected_sql_file": "alter_publication.sql", - "expected_msql_file": "alter_publication_msql.sql" - }, - { - "type": "alter", - "name": "Alter Publication event", - "endpoint": "NODE-publication.obj_id", - "sql_endpoint": "NODE-publication.sql_id", - "msql_endpoint": "NODE-publication.msql_id", - "data": { - "evnt_delete": true - }, - "expected_sql_file": "alter_publication_event.sql", - "expected_msql_file": "alter_publication_event_msql.sql" - }, - { - "type": "delete", - "name": "Drop publication", - "endpoint": "NODE-publication.delete_id", - "data": { - "name": "alterd_publication" - } - }, - { - "type": "create", - "name": "Create Publication for few tables", - "endpoint": "NODE-publication.obj", - "sql_endpoint": "NODE-publication.sql_id", - "msql_endpoint": "NODE-publication.msql", - "data": { - "name": "test_publication_create", - "evnt_insert": true, - "evnt_update": true, - "evnt_delete": true, - "evnt_truncate": true, - "pubowner": "", - "publish_via_partition_root": false, - "all_table": false, - "only_table": false, - "pubtable": [ - "public.test_table_publication" - ] - }, - "expected_sql_file": "create_publication_few_tables.sql", - "expected_msql_file": "create_publication_few_tables_msql.sql" - }, - { - "type": "alter", - "name": "Alter Publication for few tables via adding new tables", - "endpoint": "NODE-publication.obj_id", - "sql_endpoint": "NODE-publication.sql_id", - "msql_endpoint": "NODE-publication.msql_id", - "data": { - "pubtable": [ - "public.test_table_publication", - "public.test_table_publication_2" - ] - }, - "expected_sql_file": "alter_publication_add_tables.sql", - "expected_msql_file": "alter_publication_add_tables_msql.sql" - }, - { - "type": "alter", - "name": "Alter Publication for few tables via deleting tables", - "endpoint": "NODE-publication.obj_id", - "sql_endpoint": "NODE-publication.sql_id", - "msql_endpoint": "NODE-publication.msql_id", - "data": { - "pubtable": [ - "public.test_table_publication_2" - ] - }, - "expected_sql_file": "alter_publication_drop_tables.sql", - "expected_msql_file": "alter_publication_drop_tables_msql.sql" - }, - { - "type": "delete", - "name": "Drop publication for few tables", - "endpoint": "NODE-publication.delete_id", - "data": { - "name": "test_publication_create" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication.sql index e22d11dcd5b..90cd91e0fa3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION alterd_publication FOR ALL TABLES - WITH (publish = 'insert, update'); + WITH (publish = 'insert, update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_add_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_add_tables.sql index 311a3e966ee..6a568e37897 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_add_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_add_tables.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION test_publication_create FOR TABLE public.test_table_publication, public.test_table_publication_2 - WITH (publish = 'insert, update, delete, truncate'); \ No newline at end of file + WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_drop_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_drop_tables.sql index c3bea100e1d..917913dab2f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_drop_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_drop_tables.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION test_publication_create FOR TABLE public.test_table_publication_2 - WITH (publish = 'insert, update, delete, truncate'); \ No newline at end of file + WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_event.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_event.sql index e914afca54e..10b089fe77e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_event.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/alter_publication_event.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION alterd_publication FOR ALL TABLES - WITH (publish = 'insert, update, delete'); + WITH (publish = 'insert, update, delete', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication.sql index b5d88dec8cc..8c087442efc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION test_publication_create FOR ALL TABLES - WITH (publish = 'insert, update'); + WITH (publish = 'insert, update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables.sql index 4b208c597e1..f1713b9b1d1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION test_publication_create FOR TABLE public.test_table_publication - WITH (publish = 'insert, update, delete, truncate'); \ No newline at end of file + WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables_msql.sql index 629ac3abbf1..63e7e8b5194 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_few_tables_msql.sql @@ -1,3 +1,3 @@ CREATE PUBLICATION test_publication_create FOR TABLE public.test_table_publication - WITH (publish = 'insert, update, delete, truncate'); \ No newline at end of file + WITH (publish = 'insert, update, delete, truncate', publish_via_partition_root = false); \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_msql.sql index dce1b074c9b..948ab8f7a50 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_msql.sql @@ -1,3 +1,3 @@ CREATE PUBLICATION test_publication_create FOR ALL TABLES - WITH (publish = 'insert, update'); + WITH (publish = 'insert, update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update.sql index 7665b6b6998..70b985c9c16 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update.sql @@ -4,4 +4,4 @@ CREATE PUBLICATION test_publication_with_update FOR ALL TABLES - WITH (publish = 'update'); + WITH (publish = 'update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update_msql.sql index 387057398b6..4378accc104 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/create_publication_update_msql.sql @@ -1,3 +1,3 @@ CREATE PUBLICATION test_publication_with_update FOR ALL TABLES - WITH (publish = 'update'); + WITH (publish = 'update', publish_via_partition_root = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/test.json index a45d56e4f22..64c0d0fe95c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/tests/default/test.json @@ -65,6 +65,7 @@ "evnt_delete": false, "evnt_truncate": false, "pubowner": "", + "publish_via_partition_root": false, "all_table": true, "pubtable": "" }, @@ -116,6 +117,7 @@ "evnt_delete": true, "evnt_truncate": true, "pubowner": "", + "publish_via_partition_root": false, "all_table": false, "only_table": false, "pubtable": [ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/create.sql deleted file mode 100644 index 7feb2888ee4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/create.sql +++ /dev/null @@ -1,24 +0,0 @@ -{% if data %} -CREATE AGGREGATE {{conn|qtIdent(data.schema, data.name)}}({% if data.input_types %}{{data.input_types}}{% endif %}) ( - SFUNC = {{data.state_func}}, - STYPE = {{data.state_type}} {% if data.state_data_size %}, - SSPACE = {{data.state_data_size}}{% endif %}{% if data.final_func %}, - FINALFUNC = {{data.final_func}}{% endif %}{% if data.final_extra_param %}, - FINALFUNC_EXTRA{% endif %}{% if data.final_func_modify %}, - FINALFUNC_MODIFY = {{data.final_func_modify}}{% endif %}{% if data.combine_func %}, - COMBINEFUNC = {{data.combine_func}}{% endif %}{% if data.serialization_func %}, - SERIALFUNC = {{data.serialization_func}}{% endif %}{% if data.deserialization_func %}, - DESERIALFUNC = {{data.deserialization_func}}{% endif %}{% if data.initial_val %}, - INITCOND = '{{data.initial_val}}'{% endif %}{% if data.moving_state_func %}, - MSFUNC = {{data.moving_state_func}}{% endif %}{% if data.moving_inverse_func %}, - MINVFUNC = {{data.moving_inverse_func}}{% endif %}{% if data.moving_state_type %}, - MSTYPE = {{data.moving_state_type}}{% endif %}{% if data.moving_state_data_size %}, - MSSPACE = {{data.moving_state_data_size}}{% endif %}{% if data.moving_final_func %}, - MFINALFUNC = {{data.moving_final_func}}{% endif %}{% if data.moving_final_extra_param %}, - MFINALFUNC_EXTRA{% endif %}{% if data.moving_final_func_modify %}, - MFINALFUNC_MODIFY = {{data.moving_final_func_modify}}{% endif %}{% if data.moving_initial_val %}, - MINITCOND = '{{data.moving_initial_val}}'{% endif %}{% if data.sort_oper %}, - SORTOP = {{data.sort_oper}}{% endif %} - -); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql deleted file mode 100644 index 98a6a2813ee..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/11_plus/properties.sql +++ /dev/null @@ -1,47 +0,0 @@ -SELECT aggfnoid::oid as oid, proname as name, ns.nspname as schema, - pg_catalog.pg_get_userbyid(proowner) as owner, - COALESCE(pg_catalog.pg_get_function_arguments(aggfnoid::oid), '') as input_types, proacl, - CASE WHEN ag.aggkind = 'n' THEN 'normal' - WHEN ag.aggkind = 'o' THEN 'ordered-set' - WHEN ag.aggkind = 'h' THEN 'hypothetical-set' - ELSE 'unknown' END as kind, - CASE WHEN aggtransfn = '-'::regproc THEN null ELSE aggtransfn END as state_func, - CASE WHEN aggfinalfn = '-'::regproc THEN null ELSE aggfinalfn END as final_func, - CASE WHEN aggcombinefn = '-'::regproc THEN null ELSE aggcombinefn END as combine_func, - CASE WHEN aggserialfn = '-'::regproc THEN null ELSE aggserialfn END as serialization_func, - CASE WHEN aggdeserialfn = '-'::regproc THEN null ELSE aggdeserialfn END as deserialization_func, - CASE WHEN aggmtransfn = '-'::regproc THEN null ELSE aggmtransfn END as moving_state_func, - CASE WHEN aggmfinalfn = '-'::regproc THEN null ELSE aggmfinalfn END as moving_final_func, - CASE WHEN aggminvtransfn = '-'::regproc THEN null ELSE aggminvtransfn END as moving_inverse_func, - CASE WHEN ag.aggfinalmodify = 'r' THEN 'READ_ONLY' - WHEN ag.aggfinalmodify = 's' THEN 'SHAREABLE' - WHEN ag.aggfinalmodify = 'w' THEN 'READ_WRITE' - ELSE 'unknown' END as final_func_modify, - CASE WHEN ag.aggmfinalmodify = 'r' THEN 'READ_ONLY' - WHEN ag.aggmfinalmodify = 's' THEN 'SHAREABLE' - WHEN ag.aggmfinalmodify = 'w' THEN 'READ_WRITE' - ELSE 'unknown' END as moving_final_func_modify, - agginitval as initial_val, aggminitval as moving_initial_val, - op.oprname as sort_oper, aggfinalextra as final_extra_param, aggmfinalextra as moving_final_extra_param, - aggtransspace as state_data_size, aggmtransspace as moving_state_data_size, - CASE WHEN (tt.typlen = -1 AND tt.typelem != 0) THEN - (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tt.typelem) || '[]' - ELSE tt.typname END as state_type, - CASE WHEN (tf.typlen = -1 AND tf.typelem != 0) THEN - (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tf.typelem) || '[]' - ELSE tf.typname END as final_type, - CASE WHEN (tm.typlen = -1 AND tm.typelem != 0) THEN - (SELECT at.typname FROM pg_catalog.pg_type at WHERE at.oid = tm.typelem) || '[]' - ELSE tm.typname END as moving_state_type, - description -FROM pg_catalog.pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - LEFT OUTER JOIN pg_catalog.pg_type tt on tt.oid=aggtranstype - LEFT OUTER JOIN pg_catalog.pg_type tf on tf.oid=prorettype - LEFT OUTER JOIN pg_catalog.pg_type tm on tm.oid=aggmtranstype - LEFT OUTER JOIN pg_catalog.pg_operator op on op.oid = ag.aggsortop - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=aggfnoid::oid AND des.classoid='pg_aggregate'::regclass) -WHERE pronamespace = {{scid}}::oid -{% if agid %} AND ag.aggfnoid = {{agid}}::oid {% endif %} -ORDER BY name; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/12_plus/create.sql deleted file mode 100644 index 3be32aa7f3f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/12_plus/create.sql +++ /dev/null @@ -1,24 +0,0 @@ -{% if data %} -CREATE OR REPLACE AGGREGATE {{conn|qtIdent(data.schema, data.name)}}({% if data.input_types %}{{data.input_types}}{% endif %}) ( - SFUNC = {{data.state_func}}, - STYPE = {{data.state_type}} {% if data.state_data_size %}, - SSPACE = {{data.state_data_size}}{% endif %}{% if data.final_func %}, - FINALFUNC = {{data.final_func}}{% endif %}{% if data.final_extra_param %}, - FINALFUNC_EXTRA{% endif %}{% if data.final_func_modify %}, - FINALFUNC_MODIFY = {{data.final_func_modify}}{% endif %}{% if data.combine_func %}, - COMBINEFUNC = {{data.combine_func}}{% endif %}{% if data.serialization_func %}, - SERIALFUNC = {{data.serialization_func}}{% endif %}{% if data.deserialization_func %}, - DESERIALFUNC = {{data.deserialization_func}}{% endif %}{% if data.initial_val %}, - INITCOND = '{{data.initial_val}}'{% endif %}{% if data.moving_state_func %}, - MSFUNC = {{data.moving_state_func}}{% endif %}{% if data.moving_inverse_func %}, - MINVFUNC = {{data.moving_inverse_func}}{% endif %}{% if data.moving_state_type %}, - MSTYPE = {{data.moving_state_type}}{% endif %}{% if data.moving_state_data_size %}, - MSSPACE = {{data.moving_state_data_size}}{% endif %}{% if data.moving_final_func %}, - MFINALFUNC = {{data.moving_final_func}}{% endif %}{% if data.moving_final_extra_param %}, - MFINALFUNC_EXTRA{% endif %}{% if data.moving_final_func_modify %}, - MFINALFUNC_MODIFY = {{data.moving_final_func_modify}}{% endif %}{% if data.moving_initial_val %}, - MINITCOND = '{{data.moving_initial_val}}'{% endif %}{% if data.sort_oper %}, - SORTOP = {{data.sort_oper}}{% endif %} - -); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/create.sql index eae7f8429e7..3be32aa7f3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/create.sql @@ -1,10 +1,11 @@ {% if data %} -CREATE AGGREGATE {{conn|qtIdent(data.schema, data.name)}}({% if data.input_types %}{{data.input_types}}{% endif %}) ( +CREATE OR REPLACE AGGREGATE {{conn|qtIdent(data.schema, data.name)}}({% if data.input_types %}{{data.input_types}}{% endif %}) ( SFUNC = {{data.state_func}}, STYPE = {{data.state_type}} {% if data.state_data_size %}, SSPACE = {{data.state_data_size}}{% endif %}{% if data.final_func %}, FINALFUNC = {{data.final_func}}{% endif %}{% if data.final_extra_param %}, - FINALFUNC_EXTRA{% endif %}{% if data.combine_func %}, + FINALFUNC_EXTRA{% endif %}{% if data.final_func_modify %}, + FINALFUNC_MODIFY = {{data.final_func_modify}}{% endif %}{% if data.combine_func %}, COMBINEFUNC = {{data.combine_func}}{% endif %}{% if data.serialization_func %}, SERIALFUNC = {{data.serialization_func}}{% endif %}{% if data.deserialization_func %}, DESERIALFUNC = {{data.deserialization_func}}{% endif %}{% if data.initial_val %}, @@ -14,7 +15,8 @@ CREATE AGGREGATE {{conn|qtIdent(data.schema, data.name)}}({% if data.input_types MSTYPE = {{data.moving_state_type}}{% endif %}{% if data.moving_state_data_size %}, MSSPACE = {{data.moving_state_data_size}}{% endif %}{% if data.moving_final_func %}, MFINALFUNC = {{data.moving_final_func}}{% endif %}{% if data.moving_final_extra_param %}, - MFINALFUNC_EXTRA{% endif %}{% if data.moving_initial_val %}, + MFINALFUNC_EXTRA{% endif %}{% if data.moving_final_func_modify %}, + MFINALFUNC_MODIFY = {{data.moving_final_func_modify}}{% endif %}{% if data.moving_initial_val %}, MINITCOND = '{{data.moving_initial_val}}'{% endif %}{% if data.sort_oper %}, SORTOP = {{data.sort_oper}}{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql index 668f3671653..98a6a2813ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/templates/aggregates/sql/default/properties.sql @@ -13,6 +13,14 @@ SELECT aggfnoid::oid as oid, proname as name, ns.nspname as schema, CASE WHEN aggmtransfn = '-'::regproc THEN null ELSE aggmtransfn END as moving_state_func, CASE WHEN aggmfinalfn = '-'::regproc THEN null ELSE aggmfinalfn END as moving_final_func, CASE WHEN aggminvtransfn = '-'::regproc THEN null ELSE aggminvtransfn END as moving_inverse_func, + CASE WHEN ag.aggfinalmodify = 'r' THEN 'READ_ONLY' + WHEN ag.aggfinalmodify = 's' THEN 'SHAREABLE' + WHEN ag.aggfinalmodify = 'w' THEN 'READ_WRITE' + ELSE 'unknown' END as final_func_modify, + CASE WHEN ag.aggmfinalmodify = 'r' THEN 'READ_ONLY' + WHEN ag.aggmfinalmodify = 's' THEN 'SHAREABLE' + WHEN ag.aggmfinalmodify = 'w' THEN 'READ_WRITE' + ELSE 'unknown' END as moving_final_func_modify, agginitval as initial_val, aggminitval as moving_initial_val, op.oprname as sort_oper, aggfinalextra as final_extra_param, aggmfinalextra as moving_final_extra_param, aggtransspace as state_data_size, aggmtransspace as moving_state_data_size, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/create.sql deleted file mode 100644 index bf35b779a4d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/create.sql +++ /dev/null @@ -1,59 +0,0 @@ -{% if data %} -CREATE COLLATION{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} -{% if not data.copy_collation %} -{% set options = [] %} -{# if user has provided lc_collate & lc_type #} -{% if data.lc_collate and data.lc_type %} -{% if data.lc_collate and data.lc_type %} - {% set options = options + ['LC_COLLATE = ' ~ data.lc_collate|qtLiteral(conn), 'LC_CTYPE = ' ~ data.lc_type|qtLiteral(conn)] %} -{% endif %} -{% if data.provider %} -{% set options = options + ['PROVIDER = ' ~ data.provider|qtLiteral(conn)] %} -{% endif %} -{% if data.is_deterministic is defined %} -{% set options = options + ['DETERMINISTIC = ' ~ data.is_deterministic|qtLiteral(conn)] %} -{% endif %} -{% if data.rules %} -{% set options = options + ['RULES = ' ~ data.rules|qtLiteral(conn)] %} -{% endif %} -{% if data.version %} -{% set options = options + ['VERSION = ' ~ data.version|qtLiteral(conn)] %} -{% endif %} -{% endif %} -{# if user has provided locale only #} -{% if data.locale %} -{% if data.locale %} - {% set options = options + ['LOCALE = ' ~ data.locale|qtLiteral(conn)] %} -{% endif %} -{% if data.provider %} -{% set options = options + ['PROVIDER = ' ~ data.provider|qtLiteral(conn)] %} -{% endif %} -{% if data.is_deterministic is defined %} -{% set options = options + ['DETERMINISTIC = ' ~ data.is_deterministic|qtLiteral(conn)] %} -{% endif %} -{% if data.rules %} -{% set options = options + ['RULES = ' ~ data.rules|qtLiteral(conn)] %} -{% endif %} -{% if data.version %} -{% set options = options + ['VERSION = ' ~ data.version|qtLiteral(conn)] %} -{% endif %} -{% endif %} -{% if options %} -({{ options|join(', ') }}); -{% endif %} -{% endif %} -{# if user has choosed to copy from existing collation #} -{% if data.copy_collation %} - FROM {{ data.copy_collation }}; -{% endif %} -{% if data.owner %} - -ALTER COLLATION {{ conn|qtIdent(data.schema, data.name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; -{% endif %} -{% if data.description %} - -COMMENT ON COLLATION {{ conn|qtIdent(data.schema, data.name) }} - IS {{ data.description|qtLiteral(conn) }}; -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/properties.sql deleted file mode 100644 index 0f633710f4a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/12_plus/properties.sql +++ /dev/null @@ -1,10 +0,0 @@ -SELECT c.oid, c.collname AS name, c.collcollate AS lc_collate, c.collctype AS lc_type, - pg_catalog.pg_get_userbyid(c.collowner) AS owner, c.collisdeterministic AS is_deterministic, c.collversion AS version, - CASE WHEN c.collprovider = 'i' THEN 'icu' ELSE 'libc' END provider, - des.description, n.nspname AS schema -FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid AND des.classoid='pg_collation'::regclass) -WHERE c.collnamespace = {{scid}}::oid -{% if coid %} AND c.oid = {{coid}}::oid {% endif %} -ORDER BY c.collname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/create.sql index 7035e746cf1..bf35b779a4d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/create.sql @@ -10,6 +10,12 @@ CREATE COLLATION{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn| {% if data.provider %} {% set options = options + ['PROVIDER = ' ~ data.provider|qtLiteral(conn)] %} {% endif %} +{% if data.is_deterministic is defined %} +{% set options = options + ['DETERMINISTIC = ' ~ data.is_deterministic|qtLiteral(conn)] %} +{% endif %} +{% if data.rules %} +{% set options = options + ['RULES = ' ~ data.rules|qtLiteral(conn)] %} +{% endif %} {% if data.version %} {% set options = options + ['VERSION = ' ~ data.version|qtLiteral(conn)] %} {% endif %} @@ -22,6 +28,12 @@ CREATE COLLATION{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn| {% if data.provider %} {% set options = options + ['PROVIDER = ' ~ data.provider|qtLiteral(conn)] %} {% endif %} +{% if data.is_deterministic is defined %} +{% set options = options + ['DETERMINISTIC = ' ~ data.is_deterministic|qtLiteral(conn)] %} +{% endif %} +{% if data.rules %} +{% set options = options + ['RULES = ' ~ data.rules|qtLiteral(conn)] %} +{% endif %} {% if data.version %} {% set options = options + ['VERSION = ' ~ data.version|qtLiteral(conn)] %} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/properties.sql index a5a4cf42d9f..0f633710f4a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/properties.sql @@ -1,7 +1,7 @@ SELECT c.oid, c.collname AS name, c.collcollate AS lc_collate, c.collctype AS lc_type, - pg_catalog.pg_get_userbyid(c.collowner) AS owner, c.collversion AS version, - c.collprovider AS provider, des.description, n.nspname AS schema - + pg_catalog.pg_get_userbyid(c.collowner) AS owner, c.collisdeterministic AS is_deterministic, c.collversion AS version, + CASE WHEN c.collprovider = 'i' THEN 'icu' ELSE 'libc' END provider, + des.description, n.nspname AS schema FROM pg_catalog.pg_collation c JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid AND des.classoid='pg_collation'::regclass) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/alter_collation.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/alter_collation.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/alter_collation.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/alter_collation.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/create_collation.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/create_collation.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/create_collation.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/create_collation.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/create_collation_with_extra_params.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/create_collation_with_extra_params.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/create_collation_with_extra_params.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/create_collation_with_extra_params.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/create_collation_with_libc.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/create_collation_with_libc.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/create_collation_with_libc.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/create_collation_with_libc.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/msql_collation.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/msql_collation.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/msql_collation.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/msql_collation.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/13_plus/test.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/pg/default/test.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/test.json deleted file mode 100644 index 3865598fc1d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/test.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create FDW for foreign table", - "endpoint": "NODE-foreign_data_wrapper.obj", - "sql_endpoint": "NODE-foreign_data_wrapper.sql_id", - "data": { - "name": "test_fdw_for_foreign_table_columns", - "fdwacl": [], - "fdwoptions": [] - }, - "store_object_id": "True" - }, - { - "type": "create", - "name": "Create foreign server for foreign table", - "endpoint": "NODE-foreign_server.obj", - "sql_endpoint": "NODE-foreign_server.sql_id", - "data": { - "name": "test_fs_for_foreign_table_column" - }, - "store_object_id": "True" - }, - { - "type": "create", - "name": "Create Foreign Table for testing column node.", - "endpoint": "NODE-foreign_table.obj", - "sql_endpoint": "NODE-foreign_table.sql_id", - "data": { - "name": "foreign_table_2_$%{}[]()&*^!@\"'`\\/#", - "columns": [], - "schema": "public", - "basensp": "public", - "ftsrvname": "test_fs_for_foreign_table_column", - "owner": "", - "ftoptions": [], - "inherits": [], - "relacl": [], - "seclabels": [] - }, - "store_object_id": "True" - }, - { - "type": "create", - "name": "Create FT Column (Integer/Numeric type)", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "numeric", - "attlen": "10", - "attprecision": "5", - "colconstype": "n", - "attnotnull": true, - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_numeric.sql", - "expected_msql_file": "create_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter FT Column (Integer/Numeric type)", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "cltype": "real", - "coloptions": { - "added": [ - { - "option": "column_name", - "value": "test" - } - ] - } - }, - "expected_sql_file": "alter_column_numeric.sql", - "expected_msql_file": "alter_column_numeric.msql" - }, - { - "type": "delete", - "name": "Drop FT Column (Integer/Numeric type)", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "data": { - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create FT Column with text & default value", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#", - "cltype": "text", - "description": "test comment", - "attnotnull": true, - "colconstype": "n", - "defval": "'xyz'" - }, - "expected_sql_file": "create_column_text_with_default_value.sql", - "expected_msql_file": "create_column_text_with_default_value.msql" - }, - { - "type": "alter", - "name": "Alter FT Column with text & update default value", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attnum": 2, - "defval": "'changed default value'" - }, - "expected_sql_file": "alter_column_text_with_default_value.sql", - "expected_msql_file": "alter_column_text_with_default_value.msql" - }, - { - "type": "delete", - "name": "Drop FT column with text & update default value", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create FT Column with time with time zone & default value using function", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/#", - "cltype": "time with time zone", - "attacl": [], - "description": "test comment", - "attnotnull": true, - "colconstype": "n", - "defval": "now()" - }, - "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "alter", - "name": "Alter FT Column with time with time zone & update length", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attlen": "10", - "attnotnull": false, - "attnum": 3, - "description": "test comment modification" - }, - "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "delete", - "name": "Drop FT Column with time with time zone", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/" - } - }, - { - "type": "create", - "name": "Create FT Column with integer & generated always with expression, column option, variables", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "test comment", - "cltype": "bigint", - "attnotnull": true, - "coloptions": [ - { - "option": "column_name", - "value": "test_options" - } - ], - "colconstype": "g", - "is_tlength": false, - "is_precision": false, - "genexpr": "1000+1", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ] - }, - "expected_sql_file": "create_column_with_integer_generated_always_column_option_variables.sql", - "expected_msql_file": "create_column_with_integer_generated_always_column_option_variables.msql" - }, - { - "type": "alter", - "name": "Alter FT Column with integer & generated always with expression, column option, variables", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attoptions": { - "changed": [ - { - "name": "n_distinct", - "value": "111" - } - ] - }, - "coloptions": { - "changed": [ - { - "option": "column_name", - "value": "test_options_update" - } - ] - }, - "attnum": 4 - }, - "expected_sql_file": "alter_column_with_integer_generated_always_column_option_variables.sql", - "expected_msql_file": "alter_column_with_integer_generated_always_column_option_variables.msql" - }, - { - "type": "delete", - "name": "Drop FT Column with time with time zone", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_columnn.sql_id", - "data": { - "name": "col_4_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_with_integer_generated_always_column_option_variables.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_with_integer_generated_always_column_option_variables.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_with_integer_generated_always_column_option_variables.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_with_integer_generated_always_column_option_variables.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_with_integer_generated_always_column_option_variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_with_integer_generated_always_column_option_variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/alter_column_with_integer_generated_always_column_option_variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/alter_column_with_integer_generated_always_column_option_variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_with_integer_generated_always_column_option_variables.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_with_integer_generated_always_column_option_variables.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_with_integer_generated_always_column_option_variables.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_with_integer_generated_always_column_option_variables.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_with_integer_generated_always_column_option_variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_with_integer_generated_always_column_option_variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/12_plus/create_column_with_integer_generated_always_column_option_variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/create_column_with_integer_generated_always_column_option_variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/test.json index b32e46fabf6..3865598fc1d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/pg/default/test.json @@ -53,7 +53,6 @@ "cltype": "numeric", "attlen": "10", "attprecision": "5", - "coloptions": [], "colconstype": "n", "attnotnull": true, "attoptions": [], @@ -133,6 +132,116 @@ "data": { "name": "col_2_$%{}[]()&*^!@\"'`\\/#" } + }, + { + "type": "create", + "name": "Create FT Column with time with time zone & default value using function", + "endpoint": "NODE-foreign_table_column.obj", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql", + "data": { + "name": "col_3_$%{}[]()&*^!@\"'`\\/#", + "cltype": "time with time zone", + "attacl": [], + "description": "test comment", + "attnotnull": true, + "colconstype": "n", + "defval": "now()" + }, + "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", + "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" + }, + { + "type": "alter", + "name": "Alter FT Column with time with time zone & update length", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql_id", + "data": { + "attlen": "10", + "attnotnull": false, + "attnum": 3, + "description": "test comment modification" + }, + "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", + "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" + }, + { + "type": "delete", + "name": "Drop FT Column with time with time zone", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "data": { + "name": "col_3_$%{}[]()&*^!@\"'`\\/" + } + }, + { + "type": "create", + "name": "Create FT Column with integer & generated always with expression, column option, variables", + "endpoint": "NODE-foreign_table_column.obj", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql", + "data": { + "name": "col_4_$%{}[]()&*^!@\"'`\\/#", + "description": "test comment", + "cltype": "bigint", + "attnotnull": true, + "coloptions": [ + { + "option": "column_name", + "value": "test_options" + } + ], + "colconstype": "g", + "is_tlength": false, + "is_precision": false, + "genexpr": "1000+1", + "attoptions": [ + { + "name": "n_distinct", + "value": "1" + } + ] + }, + "expected_sql_file": "create_column_with_integer_generated_always_column_option_variables.sql", + "expected_msql_file": "create_column_with_integer_generated_always_column_option_variables.msql" + }, + { + "type": "alter", + "name": "Alter FT Column with integer & generated always with expression, column option, variables", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql_id", + "data": { + "attoptions": { + "changed": [ + { + "name": "n_distinct", + "value": "111" + } + ] + }, + "coloptions": { + "changed": [ + { + "option": "column_name", + "value": "test_options_update" + } + ] + }, + "attnum": 4 + }, + "expected_sql_file": "alter_column_with_integer_generated_always_column_option_variables.sql", + "expected_msql_file": "alter_column_with_integer_generated_always_column_option_variables.msql" + }, + { + "type": "delete", + "name": "Drop FT Column with time with time zone", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_columnn.sql_id", + "data": { + "name": "col_4_$%{}[]()&*^!@\"'`\\/#" + } } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/test.json deleted file mode 100644 index 3e57bd4e271..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/test.json +++ /dev/null @@ -1,213 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create FDW for foreign table", - "endpoint": "NODE-foreign_data_wrapper.obj", - "sql_endpoint": "NODE-foreign_data_wrapper.sql_id", - "data": { - "name": "test_fdw_for_foreign_table_columns", - "fdwacl": [], - "fdwoptions": [] - }, - "store_object_id": "True" - }, - { - "type": "create", - "name": "Create foreign server for foreign table", - "endpoint": "NODE-foreign_server.obj", - "sql_endpoint": "NODE-foreign_server.sql_id", - "data": { - "name":"test_fs_for_foreign_table_column" - }, - "store_object_id": "True" - }, - { - "type": "create", - "name": "Create Foreign Table for testing column node.", - "endpoint": "NODE-foreign_table.obj", - "sql_endpoint": "NODE-foreign_table.sql_id", - "data": { - "name": "foreign_table_2_$%{}[]()&*^!@\"'`\\/#", - "columns": [], - "schema": "public", - "basensp": "public", - "ftsrvname": "test_fs_for_foreign_table_column", - "owner": "enterprisedb", - "ftoptions": [], - "inherits": [], - "relacl": [], - "seclabels": [] - }, - "store_object_id": "True" - }, - { - "type": "create", - "name": "Create FT Column (Integer/Numeric type)", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "numeric", - "attlen":"10", - "attprecision":"5", - "colconstype":"n", - "attnotnull": true, - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_numeric.sql", - "expected_msql_file": "create_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter FT Column (Integer/Numeric type)", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "cltype": "real", - "coloptions":{"added":[{"option":"column_name","value":"test"}]} - }, - "expected_sql_file": "alter_column_numeric.sql", - "expected_msql_file": "alter_column_numeric.msql" - }, - { - "type": "delete", - "name": "Drop FT Column (Integer/Numeric type)", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "data": { - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create FT Column with text & default value", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#", - "cltype": "text", - "description": "test comment", - "attnotnull": true, - "colconstype": "n", - "defval": "'xyz'" - }, - "expected_sql_file": "create_column_text_with_default_value.sql", - "expected_msql_file": "create_column_text_with_default_value.msql" - }, - { - "type": "alter", - "name": "Alter FT Column with text & update default value", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attnum": 2, - "defval": "'changed default value'" - }, - "expected_sql_file": "alter_column_text_with_default_value.sql", - "expected_msql_file": "alter_column_text_with_default_value.msql" - }, - { - "type": "delete", - "name": "Drop FT column with text & update default value", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create FT Column with time with time zone & default value using function", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/#", - "cltype": "time with time zone", - "attacl": [], - "description": "test comment", - "attnotnull": true, - "colconstype": "n", - "defval": "now()" - }, - "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "alter", - "name": "Alter FT Column with time with time zone & update length", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data": { - "attlen": "10", - "attnotnull": false, - "attnum":3, - "description": "test comment modification" - }, - "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "delete", - "name": "Drop FT Column with time with time zone", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/" - } - }, - { - "type": "create", - "name": "Create FT Column with integer & generated always with expression, column option, variables", - "endpoint": "NODE-foreign_table_column.obj", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql", - "data": {"name":"col_4_$%{}[]()&*^!@\"'`\\/#", - "description":"test comment", - "cltype":"bigint", - "attnotnull":true, - "coloptions":[{"option":"column_name","value":"test_options"}], - "colconstype":"g", - "is_tlength":false, - "is_precision":false, - "genexpr":"1000+1", - "attoptions":[{"name":"n_distinct","value":"1"}]}, - "expected_sql_file": "create_column_with_integer_generated_always_column_option_variables.sql", - "expected_msql_file": "create_column_with_integer_generated_always_column_option_variables.msql" - }, - { - "type": "alter", - "name": "Alter FT Column with integer & generated always with expression, column option, variables", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_column.sql_id", - "msql_endpoint": "NODE-foreign_table_column.msql_id", - "data":{ - "attoptions":{ - "changed":[{"name":"n_distinct","value":"111"}]}, - "coloptions":{"changed":[{"option":"column_name","value":"test_options_update"}]}, - "attnum":4}, - "expected_sql_file": "alter_column_with_integer_generated_always_column_option_variables.sql", - "expected_msql_file": "alter_column_with_integer_generated_always_column_option_variables.msql" - }, - { - "type": "delete", - "name": "Drop FT Column with time with time zone", - "endpoint": "NODE-foreign_table_column.obj_id", - "sql_endpoint": "NODE-foreign_table_columnn.sql_id", - "data": { - "name":"col_4_$%{}[]()&*^!@\"'`\\/#" - } - } - ]} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_with_integer_generated_always_column_option_variables.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_with_integer_generated_always_column_option_variables.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_with_integer_generated_always_column_option_variables.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_with_integer_generated_always_column_option_variables.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_with_integer_generated_always_column_option_variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_with_integer_generated_always_column_option_variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/alter_column_with_integer_generated_always_column_option_variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/alter_column_with_integer_generated_always_column_option_variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_with_integer_generated_always_column_option_variables.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_with_integer_generated_always_column_option_variables.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_with_integer_generated_always_column_option_variables.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_with_integer_generated_always_column_option_variables.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_with_integer_generated_always_column_option_variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_with_integer_generated_always_column_option_variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/12_plus/create_column_with_integer_generated_always_column_option_variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/create_column_with_integer_generated_always_column_option_variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/test.json index 54a9b3d909a..3e57bd4e271 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/foreign_table_columns/tests/ppas/default/test.json @@ -53,7 +53,6 @@ "cltype": "numeric", "attlen":"10", "attprecision":"5", - "coloptions":[], "colconstype":"n", "attnotnull": true, "attoptions": [], @@ -126,5 +125,89 @@ "data": { "name": "col_2_$%{}[]()&*^!@\"'`\\/#" } + }, + { + "type": "create", + "name": "Create FT Column with time with time zone & default value using function", + "endpoint": "NODE-foreign_table_column.obj", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql", + "data": { + "name": "col_3_$%{}[]()&*^!@\"'`\\/#", + "cltype": "time with time zone", + "attacl": [], + "description": "test comment", + "attnotnull": true, + "colconstype": "n", + "defval": "now()" + }, + "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", + "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" + }, + { + "type": "alter", + "name": "Alter FT Column with time with time zone & update length", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql_id", + "data": { + "attlen": "10", + "attnotnull": false, + "attnum":3, + "description": "test comment modification" + }, + "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", + "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" + }, + { + "type": "delete", + "name": "Drop FT Column with time with time zone", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "data": { + "name": "col_3_$%{}[]()&*^!@\"'`\\/" + } + }, + { + "type": "create", + "name": "Create FT Column with integer & generated always with expression, column option, variables", + "endpoint": "NODE-foreign_table_column.obj", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql", + "data": {"name":"col_4_$%{}[]()&*^!@\"'`\\/#", + "description":"test comment", + "cltype":"bigint", + "attnotnull":true, + "coloptions":[{"option":"column_name","value":"test_options"}], + "colconstype":"g", + "is_tlength":false, + "is_precision":false, + "genexpr":"1000+1", + "attoptions":[{"name":"n_distinct","value":"1"}]}, + "expected_sql_file": "create_column_with_integer_generated_always_column_option_variables.sql", + "expected_msql_file": "create_column_with_integer_generated_always_column_option_variables.msql" + }, + { + "type": "alter", + "name": "Alter FT Column with integer & generated always with expression, column option, variables", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_column.sql_id", + "msql_endpoint": "NODE-foreign_table_column.msql_id", + "data":{ + "attoptions":{ + "changed":[{"name":"n_distinct","value":"111"}]}, + "coloptions":{"changed":[{"option":"column_name","value":"test_options_update"}]}, + "attnum":4}, + "expected_sql_file": "alter_column_with_integer_generated_always_column_option_variables.sql", + "expected_msql_file": "alter_column_with_integer_generated_always_column_option_variables.msql" + }, + { + "type": "delete", + "name": "Drop FT Column with time with time zone", + "endpoint": "NODE-foreign_table_column.obj_id", + "sql_endpoint": "NODE-foreign_table_columnn.sql_id", + "data": { + "name":"col_4_$%{}[]()&*^!@\"'`\\/#" + } } ]} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_columns.sql deleted file mode 100644 index 24f290a201c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_columns.sql +++ /dev/null @@ -1,52 +0,0 @@ -WITH INH_TABLES AS - (SELECT - at.attname AS name, ph.inhparent AS inheritedid, ph.inhseqno, - pg_catalog.concat(nmsp_parent.nspname, '.',parent.relname ) AS inheritedfrom - FROM - pg_catalog.pg_attribute at - JOIN - pg_catalog.pg_inherits ph ON ph.inhparent = at.attrelid AND ph.inhrelid = {{foid}}::oid - JOIN - pg_catalog.pg_class parent ON ph.inhparent = parent.oid - JOIN - pg_catalog.pg_namespace nmsp_parent ON nmsp_parent.oid = parent.relnamespace - GROUP BY at.attname, ph.inhparent, ph.inhseqno, inheritedfrom - ORDER BY at.attname, ph.inhparent, ph.inhseqno, inheritedfrom - ) -SELECT INH.inheritedfrom, INH.inheritedid, att.attoptions, att.atttypid, attfdwoptions, - att.attname as name, att.attndims, att.atttypmod, pg_catalog.format_type(t.oid,NULL) AS cltype, - att.attnotnull, att.attstorage, att.attstattarget, att.attnum, pg_catalog.format_type(t.oid, att.atttypmod) AS fulltype, - t.typstorage AS defaultstorage, - CASE WHEN t.typelem > 0 THEN t.typelem ELSE t.oid END as elemoid, - (CASE WHEN (att.attidentity in ('a', 'd')) THEN 'i' WHEN (att.attgenerated in ('s')) THEN 'g' ELSE 'n' END) AS colconstype, - (CASE WHEN (att.attgenerated in ('s')) THEN pg_catalog.pg_get_expr(def.adbin, def.adrelid) END) AS genexpr, - (SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = t.typnamespace) as typnspname, - pg_catalog.format_type(t.oid,NULL) AS typname, - CASE WHEN length(cn.nspname::text) > 0 AND length(cl.collname::text) > 0 THEN - pg_catalog.concat(cn.nspname, '."', cl.collname,'"') - ELSE '' END AS collname, - pg_catalog.pg_get_expr(def.adbin, def.adrelid) AS defval, - (SELECT COUNT(1) from pg_catalog.pg_type t2 WHERE t2.typname=t.typname) > 1 AS isdup, - des.description -FROM - pg_catalog.pg_attribute att -LEFT JOIN - INH_TABLES as INH ON att.attname = INH.name -JOIN - pg_catalog.pg_type t ON t.oid=atttypid -JOIN - pg_catalog.pg_namespace nsp ON t.typnamespace=nsp.oid -LEFT OUTER JOIN - pg_catalog.pg_attrdef def ON adrelid=att.attrelid AND adnum=att.attnum -LEFT OUTER JOIN - pg_catalog.pg_type b ON t.typelem=b.oid -LEFT OUTER JOIN - pg_catalog.pg_collation cl ON att.attcollation=cl.oid -LEFT OUTER JOIN - pg_catalog.pg_namespace cn ON cl.collnamespace=cn.oid -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=att.attrelid AND des.classoid='pg_class'::regclass AND des.objsubid = att.attnum) -WHERE - att.attrelid={{foid}}::oid - AND att.attnum>0 - ORDER BY att.attnum; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_constraints.sql deleted file mode 100644 index c9ec61c0abc..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/12_plus/get_constraints.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT - oid as conoid, conname, contype, - pg_catalog.BTRIM(substring(pg_catalog.pg_get_constraintdef(oid, true) from '\(.+\)'), '()') as consrc, - connoinherit, convalidated, conislocal -FROM - pg_catalog.pg_constraint -WHERE - conrelid={{foid}}::oid AND contype != 'n' -ORDER by conname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_columns.sql index d0b6c5fffb2..24f290a201c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_columns.sql @@ -18,6 +18,8 @@ SELECT INH.inheritedfrom, INH.inheritedid, att.attoptions, att.atttypid, attfdwo att.attnotnull, att.attstorage, att.attstattarget, att.attnum, pg_catalog.format_type(t.oid, att.atttypmod) AS fulltype, t.typstorage AS defaultstorage, CASE WHEN t.typelem > 0 THEN t.typelem ELSE t.oid END as elemoid, + (CASE WHEN (att.attidentity in ('a', 'd')) THEN 'i' WHEN (att.attgenerated in ('s')) THEN 'g' ELSE 'n' END) AS colconstype, + (CASE WHEN (att.attgenerated in ('s')) THEN pg_catalog.pg_get_expr(def.adbin, def.adrelid) END) AS genexpr, (SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = t.typnamespace) as typnspname, pg_catalog.format_type(t.oid,NULL) AS typname, CASE WHEN length(cn.nspname::text) > 0 AND length(cl.collname::text) > 0 THEN diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_constraints.sql index 4a21fcfe39e..c9ec61c0abc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/default/get_constraints.sql @@ -1,7 +1,9 @@ SELECT - oid as conoid, conname, contype, consrc, connoinherit, convalidated, conislocal + oid as conoid, conname, contype, + pg_catalog.BTRIM(substring(pg_catalog.pg_get_constraintdef(oid, true) from '\(.+\)'), '()') as consrc, + connoinherit, convalidated, conislocal FROM pg_catalog.pg_constraint WHERE - conrelid={{foid}}::oid + conrelid={{foid}}::oid AND contype != 'n' ORDER by conname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/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 deleted file mode 100644 index b9599093a3f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/coll_stats.sql +++ /dev/null @@ -1,20 +0,0 @@ -SELECT - funcname AS {{ conn|qtIdent(_('Name')) }}, - calls AS {{ conn|qtIdent(_('Number of calls')) }}, - total_time AS {{ conn|qtIdent(_('Total time')) }}, - self_time AS {{ conn|qtIdent(_('Self time')) }} -FROM - pg_catalog.pg_stat_user_functions -WHERE - schemaname = {{schema_name|qtLiteral(conn)}} - AND funcid IN ( - SELECT p.oid - FROM - pg_catalog.pg_proc p - JOIN - pg_catalog.pg_type typ ON typ.oid=p.prorettype - WHERE - p.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - ) -ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/count.sql deleted file mode 100644 index a3b4aa73fcf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/count.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql deleted file mode 100644 index 2709bc56f07..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql +++ /dev/null @@ -1,21 +0,0 @@ -{% if scid and fnid %} -SELECT - pr.proname as name, '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args, - nspname -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.oid = {{fnid}}; -{% endif %} - -{% if name %} -DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/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 deleted file mode 100644 index 9a49887784f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_definition.sql +++ /dev/null @@ -1,15 +0,0 @@ -SELECT - pg_catalog.pg_get_functiondef({{fnid}}::oid) AS func_def, - COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') as - func_with_identity_arguments, - nspname, - pr.proname as proname, - COALESCE(pg_catalog.pg_get_function_arguments(pr.oid), '') as func_args -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/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 deleted file mode 100644 index cb2eb80f858..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_oid.sql +++ /dev/null @@ -1,17 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, pr.pronamespace as nsp -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql deleted file mode 100644 index dfc141f4f85..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql +++ /dev/null @@ -1,26 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, description -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pr.prokind IN ('f', 'w') -{% if fnid %} - AND pr.oid = {{ fnid|qtLiteral(conn) }} -{% endif %} -{% if scid %} - AND pronamespace = {{scid}}::oid -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - AND typname NOT IN ('trigger', 'event_trigger') -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/properties.sql deleted file mode 100644 index b8745c6a74f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/properties.sql +++ /dev/null @@ -1,36 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/create.sql deleted file mode 100644 index 1daa2e1bd1e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/create.sql +++ /dev/null @@ -1,73 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{func_def}} -{% else %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif -%} -) -{% endif %} - RETURNS{% if data.proretset and (data.prorettypename.startswith('SETOF ') or data.prorettypename.startswith('TABLE')) %} {{ data.prorettypename }} {% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER {% endif %} -{% if data.proiswindow %}WINDOW {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED {% elif data.proparallel == 's' %}PARALLEL SAFE {% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %}{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}} -{% endif %} -{% if data.prosupportfunc %} - SUPPORT {{ data.prosupportfunc }} -{% endif -%} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/properties.sql deleted file mode 100644 index 23d9e9544a3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/properties.sql +++ /dev/null @@ -1,43 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - CASE WHEN prosupport = 0::oid THEN '' - ELSE ( - SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(proname) AS tfunctions - FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n - WHERE p.pronamespace = n.oid - AND p.oid = pr.prosupport::OID - ) END AS prosupportfunc, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/update.sql deleted file mode 100644 index 73f7cdb7f36..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/update.sql +++ /dev/null @@ -1,130 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% set set_variables = [] %} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{% set set_variables = data.merged_variables %} -{% elif 'variables' in o_data and o_data.variables|length > 0 %} -{% set set_variables = o_data.variables %} -{% endif %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %},{% endif %} -{% endfor %} -{% endif -%} -) - RETURNS {% if 'prorettypename' in data %}{{ data.prorettypename }}{% else %}{{ o_data.prorettypename }}{% endif %} - -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} - - {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/create.sql deleted file mode 100644 index bfd4361e903..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/create.sql +++ /dev/null @@ -1,82 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{func_def}} -{% else %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif -%} -) -{% endif %} - RETURNS{% if data.proretset and (data.prorettypename.startswith('SETOF ') or data.prorettypename.startswith('TABLE')) %} {{ data.prorettypename }} {% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER {% endif %} -{% if data.proiswindow %}WINDOW {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED {% elif data.proparallel == 's' %}PARALLEL SAFE {% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %}{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}} -{% endif %} -{% if data.prosupportfunc %} - SUPPORT {{ data.prosupportfunc }} -{% endif -%} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql deleted file mode 100644 index fda6d7ee53c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/properties.sql +++ /dev/null @@ -1,49 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - CASE WHEN prosupport = 0::oid THEN '' - ELSE ( - SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(proname) AS tfunctions - FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n - WHERE p.pronamespace = n.oid - AND p.oid = pr.prosupport::OID - ) END AS prosupportfunc, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/update.sql deleted file mode 100644 index 65b601b4cc7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/13_plus/update.sql +++ /dev/null @@ -1,146 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% set set_variables = [] %} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{% set set_variables = data.merged_variables %} -{% elif 'variables' in o_data and o_data.variables|length > 0 %} -{% set set_variables = o_data.variables %} -{% endif %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %},{% endif %} -{% endfor %} -{% endif -%} -) - RETURNS {% if 'prorettypename' in data %}{{ data.prorettypename }}{% else %}{{ o_data.prorettypename }}{% endif %} - -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} - - {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/create.sql deleted file mode 100644 index 57e0285f89c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/create.sql +++ /dev/null @@ -1,85 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{func_def}} -{% else %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif -%} -) -{% endif %} - RETURNS{% if data.proretset and (data.prorettypename.startswith('SETOF ') or data.prorettypename.startswith('TABLE')) %} {{ data.prorettypename }} {% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER {% endif %} -{% if data.proiswindow %}WINDOW {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED {% elif data.proparallel == 's' %}PARALLEL SAFE {% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %}{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}} -{% endif %} -{% if data.prosupportfunc %} - SUPPORT {{ data.prosupportfunc }} -{% endif -%} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -{% if data.is_pure_sql %}{{ data.prosrc }} -{% else %} -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql deleted file mode 100644 index 16fddf592ec..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/properties.sql +++ /dev/null @@ -1,51 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, - CASE WHEN pr.prosqlbody IS NOT NULL THEN true ELSE false END as is_pure_sql, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - CASE WHEN prosupport = 0::oid THEN '' - ELSE ( - SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(proname) AS tfunctions - FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n - WHERE p.pronamespace = n.oid - AND p.oid = pr.prosupport::OID - ) END AS prosupportfunc, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/update.sql deleted file mode 100644 index c7f47dacb6d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/14_plus/update.sql +++ /dev/null @@ -1,149 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% set set_variables = [] %} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{% set set_variables = data.merged_variables %} -{% elif 'variables' in o_data and o_data.variables|length > 0 %} -{% set set_variables = o_data.variables %} -{% endif %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %},{% endif %} -{% endfor %} -{% endif -%} -) - RETURNS {% if 'prorettypename' in data %}{{ data.prorettypename }}{% else %}{{ o_data.prorettypename }}{% endif %} - -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} - - {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -{% if data.is_pure_sql %}{{ data.prosrc }} -{% else %} -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/coll_stats.sql index effaeeee3bb..b9599093a3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/coll_stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/coll_stats.sql @@ -14,7 +14,7 @@ WHERE JOIN pg_catalog.pg_type typ ON typ.oid=p.prorettype WHERE - p.proisagg = FALSE + p.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') ) ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/count.sql index 5f97fdcdf3b..a3b4aa73fcf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/count.sql @@ -3,11 +3,7 @@ FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid + AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/create.sql index c58142347fc..57e0285f89c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/create.sql @@ -30,20 +30,35 @@ CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ con ROWS {{data.prorows}} {% endif %} +{% if data.prosupportfunc %} + SUPPORT {{ data.prosupportfunc }} +{% endif -%} {% if data.variables %}{% for v in data.variables %} SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} {% endif %} +{% if data.is_pure_sql %}{{ data.prosrc }} +{% else %} AS {% if data.lanname == 'c' %} {{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} {% else %} $BODY${{ data.prosrc }}$BODY${% endif -%}; +{% endif -%} {% if data.funcowner %} ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) OWNER TO {{ conn|qtIdent(data.funcowner) }}; {% endif -%} + +{% if data.dependsonextensions %} +{% for ext in data.dependsonextensions %} + +ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endfor %} +{% endif %} + {% if data.acl %} {% for p in data.acl %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/delete.sql index 6d0ce90fcfa..2709bc56f07 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/delete.sql @@ -10,7 +10,7 @@ JOIN JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND typname NOT IN ('trigger', 'event_trigger') AND pr.oid = {{fnid}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_definition.sql index 083e294f67b..9a49887784f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_definition.sql @@ -10,6 +10,6 @@ FROM JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_oid.sql index fe091cc9c8a..cb2eb80f858 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_oid.sql @@ -12,6 +12,6 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/get_support_functions.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_support_functions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/12_plus/get_support_functions.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_support_functions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql index eecbdcfdd92..dfc141f4f85 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql @@ -10,7 +10,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') {% if fnid %} AND pr.oid = {{ fnid|qtLiteral(conn) }} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/properties.sql index 5c6883761df..16fddf592ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/properties.sql @@ -1,12 +1,28 @@ SELECT - pr.oid, pr.xmin, pr.proiswindow, pr.prosrc, pr.prosrc AS prosrc_c, - pr.pronamespace, pr.prolang, pr.procost, pr.prorows, + pr.oid, pr.xmin, + CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, + pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, + pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, + CASE WHEN pr.prosqlbody IS NOT NULL THEN true ELSE false END as is_pure_sql, pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, + ( + SELECT array_agg(DISTINCT e.extname) + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid + WHERE d.objid = pr.oid + ) AS dependsonextensions, + CASE WHEN prosupport = 0::oid THEN '' + ELSE ( + SELECT pg_catalog.quote_ident(nspname) || '.' || pg_catalog.quote_ident(proname) AS tfunctions + FROM pg_catalog.pg_proc p, pg_catalog.pg_namespace n + WHERE p.pronamespace = n.oid + AND p.oid = pr.prosupport::OID + ) END AS prosupportfunc, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM @@ -24,7 +40,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') {% if fnid %} AND pr.oid = {{fnid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/update.sql index e624d5f52e8..c7f47dacb6d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/update.sql @@ -40,17 +40,22 @@ CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if d {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} + ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} + + {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} {% endif %} +{% if data.is_pure_sql %}{{ data.prosrc }} +{% else %} AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} {% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} $BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} {{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} $BODY${{ o_data.prosrc }}$BODY${% endif -%}; {% endif -%} +{% endif -%} {% if data.funcowner %} ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) @@ -125,4 +130,20 @@ ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtype SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; {% endif -%} +{% set old_exts = (o_data.dependsonextensions or []) | list %} +{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} + +{% if new_exts is not none and old_exts != new_exts %} +{% for ext in (old_exts + new_exts) | unique %} + +{% if ext in new_exts and ext not in old_exts %} +ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% elif ext in old_exts and ext not in new_exts %} +ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) + NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endif %} +{% endfor %} +{% endif %} + {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/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 deleted file mode 100644 index b9599093a3f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/coll_stats.sql +++ /dev/null @@ -1,20 +0,0 @@ -SELECT - funcname AS {{ conn|qtIdent(_('Name')) }}, - calls AS {{ conn|qtIdent(_('Number of calls')) }}, - total_time AS {{ conn|qtIdent(_('Total time')) }}, - self_time AS {{ conn|qtIdent(_('Self time')) }} -FROM - pg_catalog.pg_stat_user_functions -WHERE - schemaname = {{schema_name|qtLiteral(conn)}} - AND funcid IN ( - SELECT p.oid - FROM - pg_catalog.pg_proc p - JOIN - pg_catalog.pg_type typ ON typ.oid=p.prorettype - WHERE - p.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - ) -ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/count.sql deleted file mode 100644 index d602b1d1bc8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/count.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql deleted file mode 100644 index 1c721d1a0ac..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql +++ /dev/null @@ -1,22 +0,0 @@ -{% if scid and fnid %} -SELECT - pr.proname as name, '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args, - nspname -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.oid = {{fnid}}; -{% endif %} - -{% if name %} -DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; -{% endif %} - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/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 deleted file mode 100644 index 9a49887784f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_definition.sql +++ /dev/null @@ -1,15 +0,0 @@ -SELECT - pg_catalog.pg_get_functiondef({{fnid}}::oid) AS func_def, - COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') as - func_with_identity_arguments, - nspname, - pr.proname as proname, - COALESCE(pg_catalog.pg_get_function_arguments(pr.oid), '') as func_args -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/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 deleted file mode 100644 index cb2eb80f858..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_oid.sql +++ /dev/null @@ -1,17 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, pr.pronamespace as nsp -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql deleted file mode 100644 index 2b2dd8107e6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql +++ /dev/null @@ -1,27 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') || ')' AS name, - lanname, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pr.prokind IN ('f', 'w') - AND pr.protype = '0'::char -{% if fnid %} - AND pr.oid = {{ fnid|qtLiteral(conn) }} -{% endif %} -{% if scid %} - AND pronamespace = {{scid}}::oid -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - AND typname NOT IN ('trigger', 'event_trigger') -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/properties.sql deleted file mode 100644 index b8745c6a74f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/properties.sql +++ /dev/null @@ -1,36 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/create.sql deleted file mode 100644 index 45728f8fca4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/create.sql +++ /dev/null @@ -1,74 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{func_def}} -{% else %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif -%} -) -{% endif %} - RETURNS{% if data.proretset and (data.prorettypename.startswith('SETOF ') or data.prorettypename.startswith('TABLE')) %} {{ data.prorettypename }} {% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER {% endif %} -{% if data.proiswindow %}WINDOW {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED {% elif data.proparallel == 's' %}PARALLEL SAFE {% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %}{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}} -{% endif %} -{% if data.prosupportfunc %} - - SUPPORT {{ data.prosupportfunc }} -{% endif -%} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/properties.sql deleted file mode 100644 index 920ea8fb099..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/properties.sql +++ /dev/null @@ -1,37 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - CASE WHEN prosupport = 0::oid THEN '' ELSE prosupport::text END AS prosupportfunc, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/update.sql deleted file mode 100644 index 73f7cdb7f36..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/update.sql +++ /dev/null @@ -1,130 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% set set_variables = [] %} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{% set set_variables = data.merged_variables %} -{% elif 'variables' in o_data and o_data.variables|length > 0 %} -{% set set_variables = o_data.variables %} -{% endif %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %},{% endif %} -{% endfor %} -{% endif -%} -) - RETURNS {% if 'prorettypename' in data %}{{ data.prorettypename }}{% else %}{{ o_data.prorettypename }}{% endif %} - -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} - - {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/create.sql deleted file mode 100644 index fc5f5592bbd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/create.sql +++ /dev/null @@ -1,83 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{func_def}} -{% else %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif -%} -) -{% endif %} - RETURNS{% if data.proretset and (data.prorettypename.startswith('SETOF ') or data.prorettypename.startswith('TABLE')) %} {{ data.prorettypename }} {% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER {% endif %} -{% if data.proiswindow %}WINDOW {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED {% elif data.proparallel == 's' %}PARALLEL SAFE {% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %}{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}} -{% endif %} -{% if data.prosupportfunc %} - - SUPPORT {{ data.prosupportfunc }} -{% endif -%} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql deleted file mode 100644 index 3bd50ac932d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/properties.sql +++ /dev/null @@ -1,43 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - CASE WHEN prosupport = 0::oid THEN '' ELSE prosupport::text END AS prosupportfunc, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/update.sql deleted file mode 100644 index 65b601b4cc7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/13_plus/update.sql +++ /dev/null @@ -1,146 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% set set_variables = [] %} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{% set set_variables = data.merged_variables %} -{% elif 'variables' in o_data and o_data.variables|length > 0 %} -{% set set_variables = o_data.variables %} -{% endif %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %},{% endif %} -{% endfor %} -{% endif -%} -) - RETURNS {% if 'prorettypename' in data %}{{ data.prorettypename }}{% else %}{{ o_data.prorettypename }}{% endif %} - -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} - - {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/create.sql deleted file mode 100644 index 57e0285f89c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/create.sql +++ /dev/null @@ -1,85 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{func_def}} -{% else %} -CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif -%} -) -{% endif %} - RETURNS{% if data.proretset and (data.prorettypename.startswith('SETOF ') or data.prorettypename.startswith('TABLE')) %} {{ data.prorettypename }} {% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER {% endif %} -{% if data.proiswindow %}WINDOW {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED {% elif data.proparallel == 's' %}PARALLEL SAFE {% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %}{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}} -{% endif %} -{% if data.prosupportfunc %} - SUPPORT {{ data.prosupportfunc }} -{% endif -%} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -{% if data.is_pure_sql %}{{ data.prosrc }} -{% else %} -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql deleted file mode 100644 index e4837cca15a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/properties.sql +++ /dev/null @@ -1,45 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, - CASE WHEN pr.prosqlbody IS NOT NULL THEN true ELSE false END as is_pure_sql, - CASE WHEN prosupport = 0::oid THEN '' ELSE prosupport::text END AS prosupportfunc, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/update.sql deleted file mode 100644 index c7f47dacb6d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/14_plus/update.sql +++ /dev/null @@ -1,149 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% set set_variables = [] %} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{% set set_variables = data.merged_variables %} -{% elif 'variables' in o_data and o_data.variables|length > 0 %} -{% set set_variables = o_data.variables %} -{% endif %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %} -{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %},{% endif %} -{% endfor %} -{% endif -%} -) - RETURNS {% if 'prorettypename' in data %}{{ data.prorettypename }}{% else %}{{ o_data.prorettypename }}{% endif %} - -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} - - {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -{% if data.is_pure_sql %}{{ data.prosrc }} -{% else %} -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/coll_stats.sql index effaeeee3bb..b9599093a3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/coll_stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/coll_stats.sql @@ -14,7 +14,7 @@ WHERE JOIN pg_catalog.pg_type typ ON typ.oid=p.prorettype WHERE - p.proisagg = FALSE + p.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') ) ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/count.sql index 5f97fdcdf3b..d602b1d1bc8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/count.sql @@ -3,11 +3,7 @@ FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') AND pronamespace = {{scid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/create.sql index c58142347fc..57e0285f89c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/create.sql @@ -30,20 +30,35 @@ CREATE{% if query_type is defined %}{{' OR REPLACE'}}{% endif %} FUNCTION {{ con ROWS {{data.prorows}} {% endif %} +{% if data.prosupportfunc %} + SUPPORT {{ data.prosupportfunc }} +{% endif -%} {% if data.variables %}{% for v in data.variables %} SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} {% endif %} +{% if data.is_pure_sql %}{{ data.prosrc }} +{% else %} AS {% if data.lanname == 'c' %} {{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} {% else %} $BODY${{ data.prosrc }}$BODY${% endif -%}; +{% endif -%} {% if data.funcowner %} ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) OWNER TO {{ conn|qtIdent(data.funcowner) }}; {% endif -%} + +{% if data.dependsonextensions %} +{% for ext in data.dependsonextensions %} + +ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endfor %} +{% endif %} + {% if data.acl %} {% for p in data.acl %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/delete.sql index 6d0ce90fcfa..1c721d1a0ac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/delete.sql @@ -10,7 +10,7 @@ JOIN JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND typname NOT IN ('trigger', 'event_trigger') AND pr.oid = {{fnid}}; @@ -19,3 +19,4 @@ WHERE {% if name %} DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; {% endif %} + diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_definition.sql index 083e294f67b..9a49887784f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_definition.sql @@ -10,6 +10,6 @@ FROM JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_oid.sql index fe091cc9c8a..cb2eb80f858 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_oid.sql @@ -12,6 +12,6 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/get_support_functions.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_support_functions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/12_plus/get_support_functions.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_support_functions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql index 27e21278212..2b2dd8107e6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql @@ -10,7 +10,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pr.protype = '0'::char {% if fnid %} AND pr.oid = {{ fnid|qtLiteral(conn) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/properties.sql index 5c6883761df..e4837cca15a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/properties.sql @@ -1,12 +1,22 @@ SELECT - pr.oid, pr.xmin, pr.proiswindow, pr.prosrc, pr.prosrc AS prosrc_c, - pr.pronamespace, pr.prolang, pr.procost, pr.prorows, + pr.oid, pr.xmin, + CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, + pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, + ( + SELECT array_agg(DISTINCT e.extname) + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid + WHERE d.objid = pr.oid + ) AS dependsonextensions, + pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, + CASE WHEN pr.prosqlbody IS NOT NULL THEN true ELSE false END as is_pure_sql, + CASE WHEN prosupport = 0::oid THEN '' ELSE prosupport::text END AS prosupportfunc, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM @@ -24,7 +34,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') {% if fnid %} AND pr.oid = {{fnid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/update.sql index e624d5f52e8..c7f47dacb6d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/update.sql @@ -40,17 +40,22 @@ CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({% if d {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows and data.prorows != '0' %} - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} + ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif %} + + {% if data.prosupportfunc %}SUPPORT {{ data.prosupportfunc }}{% elif data.prosupportfunc is not defined and o_data.prosupportfunc %}SUPPORT {{ o_data.prosupportfunc }}{% endif -%}{% if set_variables and set_variables|length > 0 %}{% for v in set_variables %} SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} {% endif %} +{% if data.is_pure_sql %}{{ data.prosrc }} +{% else %} AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} {% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} $BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} {{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} $BODY${{ o_data.prosrc }}$BODY${% endif -%}; {% endif -%} +{% endif -%} {% if data.funcowner %} ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) @@ -125,4 +130,20 @@ ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtype SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; {% endif -%} +{% set old_exts = (o_data.dependsonextensions or []) | list %} +{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} + +{% if new_exts is not none and old_exts != new_exts %} +{% for ext in (old_exts + new_exts) | unique %} + +{% if ext in new_exts and ext not in old_exts %} +ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% elif ext in old_exts and ext not in new_exts %} +ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) + NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endif %} +{% endfor %} +{% endif %} + {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/create.sql deleted file mode 100644 index 807268a6153..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/create.sql +++ /dev/null @@ -1,58 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE OR REPLACE PROCEDURE {{func_def}} -{% else %} -CREATE{% if add_replace_clause %} OR REPLACE{% endif %} PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}{% if data.arguments is defined %} -({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname)}} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor -%} -{% endif %} -) -{% endif %} -LANGUAGE {{ data.lanname|qtLiteral(conn) }}{% if data.prosecdef %} - - SECURITY DEFINER {% endif %} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; - -{% if data.funcowner %} -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.acl and not is_sql %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "PROCEDURE", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "PROCEDURE", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/properties.sql deleted file mode 100644 index d51e26d5bb4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/properties.sql +++ /dev/null @@ -1,47 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - WITH name_with_args_tab AS (SELECT pg_catalog.pg_get_function_identity_arguments(pr.oid) AS val) - SELECT CASE WHEN - val <> '' - THEN - pr.proname || '(' || val || ')' - ELSE - pr.proname::text - END - FROM name_with_args_tab - ) AS name_with_args, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind = 'p' - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/update.sql deleted file mode 100644 index f5aee3efe59..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/update.sql +++ /dev/null @@ -1,112 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} - -{% endif -%} -{% if data.change_func %} -CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %}{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif %} -) -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %}SECURITY DEFINER{% endif %} -{% if data.merged_variables %}{% for v in data.merged_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, - priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif %} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'PROCEDURE', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.pronamespace %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/create.sql deleted file mode 100644 index 04f20fe2dbf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/create.sql +++ /dev/null @@ -1,66 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE OR REPLACE PROCEDURE {{func_def}} -{% else %} -CREATE{% if add_replace_clause %} OR REPLACE{% endif %} PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}{% if data.arguments is defined %} -({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname)}} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor -%} -{% endif %} -) -{% endif %} -LANGUAGE {{ data.lanname|qtLiteral(conn) }}{% if data.prosecdef %} - - SECURITY DEFINER {% endif %} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; - -{% if data.funcowner %} -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl and not is_sql %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "PROCEDURE", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "PROCEDURE", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql deleted file mode 100644 index 627b8e500f5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/properties.sql +++ /dev/null @@ -1,53 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - ( - WITH name_with_args_tab AS (SELECT pg_catalog.pg_get_function_identity_arguments(pr.oid) AS val) - SELECT CASE WHEN - val <> '' - THEN - pr.proname || '(' || val || ')' - ELSE - pr.proname::text - END - FROM name_with_args_tab - ) AS name_with_args, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind = 'p' - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/update.sql deleted file mode 100644 index c2d004b82f1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/13_plus/update.sql +++ /dev/null @@ -1,128 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} - -{% endif -%} -{% if data.change_func %} -CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %}{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif %} -) -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %}SECURITY DEFINER{% endif %} -{% if data.merged_variables %}{% for v in data.merged_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, - priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif %} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'PROCEDURE', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.pronamespace %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/count.sql deleted file mode 100644 index 1be1b396147..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/count.sql +++ /dev/null @@ -1,13 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -WHERE - pr.prokind = 'p' - AND typname NOT IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/count.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/count.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/count.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/14_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/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 deleted file mode 100644 index 3a3bf569845..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/coll_stats.sql +++ /dev/null @@ -1,20 +0,0 @@ -SELECT - funcname AS {{ conn|qtIdent(_('Name')) }}, - calls AS {{ conn|qtIdent(_('Number of calls')) }}, - total_time AS {{ conn|qtIdent(_('Total time')) }}, - self_time AS {{ conn|qtIdent(_('Self time')) }} -FROM - pg_catalog.pg_stat_user_functions -WHERE - schemaname = {{schema_name|qtLiteral(conn)}} - AND funcid IN ( - SELECT p.oid - FROM - pg_catalog.pg_proc p - JOIN - pg_catalog.pg_type typ ON typ.oid=p.prorettype - WHERE - p.prokind = 'p'::char - AND typname NOT IN ('trigger', 'event_trigger') - ) -ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/count.sql deleted file mode 100644 index edbed6d4cba..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/count.sql +++ /dev/null @@ -1,13 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -WHERE - pr.prokind = 'p'::char - AND typname NOT IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/create.sql deleted file mode 100644 index cd8c921515d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/create.sql +++ /dev/null @@ -1,66 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE OR REPLACE PROCEDURE {{func_def}} -{% else %} -CREATE{% if add_replace_clause %} OR REPLACE{% endif %} PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}{% if data.arguments is defined %} -({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname)}} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor -%} -{% endif %} -) -{% endif %} -LANGUAGE {{ data.lanname|qtLiteral(conn) }}{% if data.prosecdef %} - - SECURITY DEFINER {% endif %} -{% if data.lanname == 'edbspl' %} -{% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED{% elif data.proparallel == 's' %}PARALLEL SAFE{% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %} {% endif %}{% if data.procost %} - - COST {{data.procost}}{% endif %}{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}}{% endif -%}{% endif %}{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; - -{% if data.funcowner %} -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.acl and not is_sql %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "PROCEDURE", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "PROCEDURE", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql deleted file mode 100644 index daacd44ee34..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql +++ /dev/null @@ -1,21 +0,0 @@ -{% if scid and fnid %} -SELECT - pr.proname as name, '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args, - nspname -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind = 'p'::char - AND pronamespace = {{scid}}::oid - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.oid = {{fnid}}; -{% endif %} - -{% if name %} -DROP PROCEDURE IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/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 deleted file mode 100644 index cd566e2d3e7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_definition.sql +++ /dev/null @@ -1,15 +0,0 @@ -SELECT - pg_catalog.pg_get_functiondef({{fnid}}::oid) AS func_def, - COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') as - func_with_identity_arguments, - nspname, - pr.proname as proname, - COALESCE(pg_catalog.pg_get_function_arguments(pr.oid), '') as func_args -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind = 'p'::char - AND pronamespace = {{scid}}::oid - AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/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 deleted file mode 100644 index 89a61772e9c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_oid.sql +++ /dev/null @@ -1,17 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, pr.pronamespace AS nsp -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind = 'p'::char - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql deleted file mode 100644 index 24f25c75d59..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql +++ /dev/null @@ -1,33 +0,0 @@ -SELECT - pr.oid, - CASE WHEN - pg_catalog.pg_get_function_identity_arguments(pr.oid) <> '' - THEN - pr.proname || '(' || pg_catalog.pg_get_function_identity_arguments(pr.oid) || ')' - ELSE - pr.proname::text - END AS name, - lanname, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pr.prokind = 'p'::char -{% if fnid %} - AND pr.oid = {{ fnid|qtLiteral(conn) }} -{% endif %} -{% if scid %} - AND pronamespace = {{scid}}::oid -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - AND typname NOT IN ('trigger', 'event_trigger') -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/properties.sql deleted file mode 100644 index dcca1a9170d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/properties.sql +++ /dev/null @@ -1,47 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - WITH name_with_args_tab AS (SELECT pg_catalog.pg_get_function_identity_arguments(pr.oid) AS val) - SELECT CASE WHEN - val <> '' - THEN - pr.proname || '(' || val || ')' - ELSE - pr.proname::text - END - FROM name_with_args_tab - ) AS name_with_args, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind = 'p'::char - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/update.sql deleted file mode 100644 index 497d5382254..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/update.sql +++ /dev/null @@ -1,121 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} - -{% endif -%} -{% if data.change_func %} -CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %}{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif %} -) -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %} -{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }} {% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %}SECURITY DEFINER{% endif %} -{% if data.lanname == 'edbspl' or (o_data.lanname == 'edbspl' and not 'lanname' in data ) %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% else %} NOT LEAKPROOF{% endif %} - {% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}}{% endif -%}{% if data.merged_variables %}{% for v in data.merged_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} -{% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif %} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'PROCEDURE', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.pronamespace %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/create.sql deleted file mode 100644 index 04f20fe2dbf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/create.sql +++ /dev/null @@ -1,66 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE OR REPLACE PROCEDURE {{func_def}} -{% else %} -CREATE{% if add_replace_clause %} OR REPLACE{% endif %} PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}{% if data.arguments is defined %} -({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname)}} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor -%} -{% endif %} -) -{% endif %} -LANGUAGE {{ data.lanname|qtLiteral(conn) }}{% if data.prosecdef %} - - SECURITY DEFINER {% endif %} -{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; - -{% if data.funcowner %} -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl and not is_sql %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "PROCEDURE", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "PROCEDURE", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql deleted file mode 100644 index 627b8e500f5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/properties.sql +++ /dev/null @@ -1,53 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - ( - WITH name_with_args_tab AS (SELECT pg_catalog.pg_get_function_identity_arguments(pr.oid) AS val) - SELECT CASE WHEN - val <> '' - THEN - pr.proname || '(' || val || ')' - ELSE - pr.proname::text - END - FROM name_with_args_tab - ) AS name_with_args, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind = 'p' - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/update.sql deleted file mode 100644 index c2d004b82f1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/13_plus/update.sql +++ /dev/null @@ -1,128 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} - -{% endif -%} -{% if data.change_func %} -CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %}{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif %} -) -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %}SECURITY DEFINER{% endif %} -{% if data.merged_variables %}{% for v in data.merged_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, - priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif %} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'PROCEDURE', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.pronamespace %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/count.sql deleted file mode 100644 index edbed6d4cba..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/count.sql +++ /dev/null @@ -1,13 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -WHERE - pr.prokind = 'p'::char - AND typname NOT IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/create.sql deleted file mode 100644 index 64b9ff86f0c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/create.sql +++ /dev/null @@ -1,77 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -{% if query_for == 'sql_panel' and func_def is defined %} -CREATE OR REPLACE PROCEDURE {{func_def}} -{% else %} -CREATE{% if add_replace_clause %} OR REPLACE{% endif %} PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}{% if data.arguments is defined %} -({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname)}} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor -%} -{% endif %} -) -{% endif %} -LANGUAGE {{ data.lanname|qtLiteral(conn) }}{% if data.prosecdef %} - - SECURITY DEFINER {% endif %} -{% if data.lanname == 'edbspl' %} -{% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} -{% if data.proisstrict %}STRICT {% endif %} -{% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %}PARALLEL RESTRICTED{% elif data.proparallel == 's' %}PARALLEL SAFE{% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %} {% endif %}{% if data.procost %} - - COST {{data.procost}}{% endif %}{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}}{% endif -%}{% endif %}{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} - -{% if data.is_pure_sql %}{{ data.prosrc }} -{% else %} -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% endif -%} - -{% if data.funcowner %} -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} - -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} - -{% if data.acl and not is_sql %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "PROCEDURE", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args_without)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "PROCEDURE", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', data.name, r.provider, r.label, data.pronamespace, data.func_args_without) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql deleted file mode 100644 index 72b8bfe0084..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/properties.sql +++ /dev/null @@ -1,55 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = pr.oid - ) AS dependsonextensions, - pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, - CASE WHEN pr.prosqlbody IS NOT NULL THEN true ELSE false END as is_pure_sql, - ( - WITH name_with_args_tab AS (SELECT pg_catalog.pg_get_function_identity_arguments(pr.oid) AS val) - SELECT CASE WHEN - val <> '' - THEN - pr.proname || '(' || val || ')' - ELSE - pr.proname::text - END - FROM name_with_args_tab - ) AS name_with_args, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind = 'p'::char - AND typname NOT IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/update.sql deleted file mode 100644 index 307fa18ed32..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/14_plus/update.sql +++ /dev/null @@ -1,140 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} - -{% endif -%} -{% if data.change_func %} -CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %}{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} -{% if not loop.last %}, {% endif %} -{% endfor %} -{% endif %} -) -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %} -{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }} {% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %}SECURITY DEFINER{% endif %} -{% if data.lanname == 'edbspl' or (o_data.lanname == 'edbspl' and not 'lanname' in data ) %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% else %} NOT LEAKPROOF{% endif %} - {% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} - - {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}}{% endif -%}{% if data.merged_variables %}{% for v in data.merged_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} -{% endif %} -{% endif %} - -{% if data.is_pure_sql %}{{ data.prosrc }} -{% else %} -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% endif -%} -{% if data.funcowner %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'PROCEDURE', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif %} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'PROCEDURE', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'PROCEDURE', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.pronamespace %} - -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} - -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/coll_stats.sql index effaeeee3bb..3a3bf569845 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/coll_stats.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/coll_stats.sql @@ -14,7 +14,7 @@ WHERE JOIN pg_catalog.pg_type typ ON typ.oid=p.prorettype WHERE - p.proisagg = FALSE + p.prokind = 'p'::char AND typname NOT IN ('trigger', 'event_trigger') ) ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/count.sql index aa89e2f8a76..edbed6d4cba 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/count.sql @@ -8,6 +8,6 @@ JOIN JOIN pg_catalog.pg_language lng ON lng.oid=prolang WHERE - proisagg = FALSE + pr.prokind = 'p'::char AND typname NOT IN ('trigger', 'event_trigger') AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/create.sql index 51efc8635f2..64b9ff86f0c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/create.sql @@ -11,29 +11,46 @@ CREATE{% if add_replace_clause %} OR REPLACE{% endif %} PROCEDURE {{ conn|qtIden ({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname)}} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} {% if not loop.last %}, {% endif %} {% endfor -%} -){% endif %} - {% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} +) +{% endif %} +LANGUAGE {{ data.lanname|qtLiteral(conn) }}{% if data.prosecdef %} + + SECURITY DEFINER {% endif %} +{% if data.lanname == 'edbspl' %} +{% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %} {% endif %}{% if data.proleakproof %}LEAKPROOF {% endif %} {% if data.proisstrict %}STRICT {% endif %} -{% if data.prosecdef %}SECURITY DEFINER{% endif %} {% if data.proparallel and (data.proparallel == 'r' or data.proparallel == 's' or data.proparallel == 'u') %} -{% if data.proparallel == 'r' %} PARALLEL RESTRICTED{% elif data.proparallel == 's' %} PARALLEL SAFE {% elif data.proparallel == 'u' %} PARALLEL UNSAFE{% endif %}{% endif %}{% if data.procost %} +{% if data.proparallel == 'r' %}PARALLEL RESTRICTED{% elif data.proparallel == 's' %}PARALLEL SAFE{% elif data.proparallel == 'u' %}PARALLEL UNSAFE{% endif %} {% endif %}{% if data.procost %} COST {{data.procost}}{% endif %}{% if data.prorows and (data.prorows | int) > 0 %} - ROWS {{data.prorows}}{% endif -%}{% if data.variables %}{% for v in data.variables %} + ROWS {{data.prorows}}{% endif -%}{% endif %}{% if data.variables %}{% for v in data.variables %} SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} {% endif %} -AS {{ data.prosrc }}; +{% if data.is_pure_sql %}{{ data.prosrc }} +{% else %} +AS {% if data.lanname == 'c' %} +{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} +{% else %} +$BODY${{ data.prosrc }}$BODY${% endif -%}; +{% endif -%} {% if data.funcowner %} -ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }} +ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) OWNER TO {{ conn|qtIdent(data.funcowner) }}; {% endif -%} +{% if data.dependsonextensions %} +{% for ext in data.dependsonextensions %} + +ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endfor %} +{% endif %} + {% if data.acl and not is_sql %} {% for p in data.acl %} @@ -45,7 +62,7 @@ ALTER PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }} {% endif %} {% if data.description %} -COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }} +COMMENT ON PROCEDURE {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args_without}}) IS {{ data.description|qtLiteral(conn) }}; {% endif -%} {% if data.seclabels %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/delete.sql index 4008e7be3e7..daacd44ee34 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/delete.sql @@ -10,12 +10,12 @@ JOIN JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind = 'p'::char AND pronamespace = {{scid}}::oid AND typname NOT IN ('trigger', 'event_trigger') AND pr.oid = {{fnid}}; {% endif %} {% if name %} -DROP PROCEDURE {{ conn|qtIdent(nspname, name) }}; +DROP PROCEDURE IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_definition.sql index 083e294f67b..cd566e2d3e7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_definition.sql @@ -10,6 +10,6 @@ FROM JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind = 'p'::char AND pronamespace = {{scid}}::oid AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_oid.sql index 5b05f7933a6..89a61772e9c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_oid.sql @@ -12,6 +12,6 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind = 'p'::char AND typname NOT IN ('trigger', 'event_trigger') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql index dde3fbeb7f0..24f25c75d59 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql @@ -17,8 +17,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE - AND pr.protype = '1'::char + pr.prokind = 'p'::char {% if fnid %} AND pr.oid = {{ fnid|qtLiteral(conn) }} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/properties.sql index af676f3e31c..72b8bfe0084 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/properties.sql @@ -1,12 +1,21 @@ SELECT pr.oid, pr.xmin, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, + CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, + pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, + ( + SELECT array_agg(DISTINCT e.extname) + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid + WHERE d.objid = pr.oid + ) AS dependsonextensions, + pg_catalog.pg_get_function_sqlbody(pr.oid) AS prosrc_sql, + CASE WHEN pr.prosqlbody IS NOT NULL THEN true ELSE false END as is_pure_sql, ( WITH name_with_args_tab AS (SELECT pg_catalog.pg_get_function_identity_arguments(pr.oid) AS val) SELECT CASE WHEN @@ -35,7 +44,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) WHERE - proisagg = FALSE + pr.prokind = 'p'::char AND typname NOT IN ('trigger', 'event_trigger') {% if fnid %} AND pr.oid = {{fnid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/update.sql index 1c0e885179f..307fa18ed32 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/update.sql @@ -5,21 +5,28 @@ {% set exclude_quoting = ['search_path'] %} {% if data.name %} {% if data.name != o_data.name %} -ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }} +ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}{% if o_data.proargtypenames %}({{ o_data.proargtypenames }}){% endif %} + RENAME TO {{ conn|qtIdent(data.name) }}; {% set name = data.name %} {% endif %} + {% endif -%} {% if data.change_func %} -CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if data.arguments %}({% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} +CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({% if data.arguments %}{% for p in data.arguments %}{% if p.argmode %}{{p.argmode}} {% endif %}{% if p.argname %}{{ conn|qtIdent(p.argname) }} {% endif %}{% if p.argtype %}{{ p.argtype }}{% endif %}{% if p.argdefval %} DEFAULT {{p.argdefval}}{% endif %} {% if not loop.last %}, {% endif %} {% endfor %} -) {% endif %} - - {% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} {% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %}LEAKPROOF{% else %}NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} +) +{% if 'lanname' in data %} + LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} + LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} + {% endif %} +{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }} {% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }} {% endif %} +{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %}SECURITY DEFINER{% endif %} +{% if data.lanname == 'edbspl' or (o_data.lanname == 'edbspl' and not 'lanname' in data ) %} +{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% else %} NOT LEAKPROOF{% endif %} + {% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} {% if 'proparallel' in data and data.proparallel %}PARALLEL {{ data.proparallel }}{% elif 'proparallel' not in data and o_data.proparallel %}PARALLEL {{ o_data.proparallel }}{% endif %} @@ -29,8 +36,16 @@ CREATE OR REPLACE PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if d SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} {% endif %} +{% endif %} -AS {% if data.prosrc %}{{ data.prosrc }}{% else %}{{ o_data.prosrc }}{% endif %}; +{% if data.is_pure_sql %}{{ data.prosrc }} +{% else %} +AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} +{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} +$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} +{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} +$BODY${{ o_data.prosrc }}$BODY${% endif -%}; +{% endif -%} {% endif -%} {% if data.funcowner %} @@ -45,7 +60,7 @@ ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proarg {{ PRIVILEGE.UNSETALL(conn, 'PROCEDURE', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} {% endfor %} {% endif -%} -{% if 'changed' in data.datacl %} +{% if 'changed' in data.acl %} {% for priv in data.acl.changed %} {% if priv.grantee != priv.old_grantee %} @@ -68,11 +83,11 @@ ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proarg {% if data.variables %} {% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} -{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace) }} +{{ VARIABLE.UNSET(conn, 'PROCEDURE', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} {% endif -%} {% if 'merged_variables' in data and data.merged_variables|length > 0 %} -{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace) }} +{{ VARIABLE.SET(conn, 'PROCEDURE', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} {% endif -%} {% endif -%} {% endif -%} @@ -97,7 +112,7 @@ ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}{% if o_data.proarg {% endif -%} {% if data.description is defined and data.description != o_data.description%} -COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} +COMMENT ON PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) IS {{ data.description|qtLiteral(conn) }}; {% endif -%} {% if data.pronamespace %} @@ -106,4 +121,20 @@ ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }} SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; {% endif -%} +{% set old_exts = (o_data.dependsonextensions or []) | list %} +{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} + +{% if new_exts is not none and old_exts != new_exts %} +{% for ext in (old_exts + new_exts) | unique %} + +{% if ext in new_exts and ext not in old_exts %} +ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% elif ext in old_exts and ext not in new_exts %} +ALTER PROCEDURE {{ conn|qtIdent(o_data.pronamespace, name) }}({{ o_data.proargtypenames }}) + NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endif %} +{% endfor %} +{% endif %} + {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index ae9079b90d7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/coll_stats.sql +++ /dev/null @@ -1,20 +0,0 @@ -SELECT - funcname AS {{ conn|qtIdent(_('Name')) }}, - calls AS {{ conn|qtIdent(_('Number of calls')) }}, - total_time AS {{ conn|qtIdent(_('Total time')) }}, - self_time AS {{ conn|qtIdent(_('Self time')) }} -FROM - pg_catalog.pg_stat_user_functions -WHERE - schemaname = {{schema_name|qtLiteral(conn)}} - AND funcid IN ( - SELECT p.oid - FROM - pg_catalog.pg_proc p - JOIN - pg_catalog.pg_type typ ON typ.oid=p.prorettype - WHERE - p.prokind IN ('f', 'w') - AND typname = 'trigger' - ) -ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/count.sql deleted file mode 100644 index 0c4e2cd657d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/count.sql +++ /dev/null @@ -1,14 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -WHERE - pr.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('edbspl', 'sql', 'internal') - AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 9377e6a4661..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/create.sql +++ /dev/null @@ -1,57 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %} -{% set is_columns = [] %} -{% set exclude_quoting = ['search_path'] %} -{% if data %} -CREATE{% if add_replace_clause %} OR REPLACE{% endif %} FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({% if data.proargnames %}{{data.proargnames}}{% endif %}) - RETURNS{% if data.proretset and data.prorettypename.startswith('SETOF ') %} {{ data.prorettypename }}{% elif data.proretset %} SETOF {{ data.prorettypename }}{% else %} {{ data.prorettypename }}{% endif %} - - LANGUAGE {{ data.lanname|qtLiteral(conn) }} -{% if data.procost %} - COST {{data.procost}} -{% endif %} - {% if data.provolatile %}{% if data.provolatile == 'i' %}IMMUTABLE{% elif data.provolatile == 's' %}STABLE{% else %}VOLATILE{% endif %}{% endif %}{% if data.proleakproof %} LEAKPROOF{% else %} NOT LEAKPROOF{% endif %} -{% if data.proisstrict %} STRICT{% endif %} -{% if data.prosecdef %} SECURITY DEFINER{% endif %} -{% if data.proiswindow %} WINDOW{% endif %} -{% if data.prorows and (data.prorows | int) > 0 %} - - ROWS {{data.prorows}}{% endif -%}{% if data.variables %}{% for v in data.variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor %} -{% endif %} - -AS {% if data.lanname == 'c' %} -{{ data.probin|qtLiteral(conn) }}, {{ data.prosrc_c|qtLiteral(conn) }} -{% else %} -$BODY${{ data.prosrc }}$BODY${% endif -%}; -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args}}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{% if data.acl %} -{% for p in data.acl %} - -{{ PRIVILEGE.SET(conn, "FUNCTION", p.grantee, data.name, p.without_grant, p.with_grant, data.pronamespace, data.func_args)}} -{% endfor %}{% endif %} -{% if data.revoke_all %} - -{{ PRIVILEGE.UNSETALL(conn, "FUNCTION", "PUBLIC", data.name, data.pronamespace, data.func_args_without)}} -{% endif %} -{% if data.description %} - -COMMENT ON FUNCTION {{ conn|qtIdent(data.pronamespace, data.name) }}({{data.func_args}}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} -{% if data.seclabels %} -{% for r in data.seclabels %} -{% if r.label and r.provider %} - -{{ SECLABEL.SET(conn, 'FUNCTION', data.name, r.provider, r.label, data.pronamespace, data.func_args) }} -{% endif %} -{% endfor %} -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 4eb207cf245..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/delete.sql +++ /dev/null @@ -1,21 +0,0 @@ -{% if scid and fnid %} -SELECT - pr.proname as name, '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args, - nspname -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND typname IN ('trigger', 'event_trigger') - AND pr.oid = {{fnid}}; -{% endif %} - -{% if name %} -DROP FUNCTION {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 9a49887784f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_definition.sql +++ /dev/null @@ -1,15 +0,0 @@ -SELECT - pg_catalog.pg_get_functiondef({{fnid}}::oid) AS func_def, - COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') as - func_with_identity_arguments, - nspname, - pr.proname as proname, - COALESCE(pg_catalog.pg_get_function_arguments(pr.oid), '') as func_args -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 1da0793f9a9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_oid.sql +++ /dev/null @@ -1,18 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, pr.pronamespace AS nsp -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('edbspl', 'sql', 'internal') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 4619bcfcf89..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/node.sql +++ /dev/null @@ -1,27 +0,0 @@ -SELECT - pr.oid, pr.proname || '()' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, description -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pr.prokind IN ('f', 'w') -{% if fnid %} - AND pr.oid = {{ fnid|qtLiteral(conn) }} -{% endif %} -{% if scid %} - AND pronamespace = {{scid}}::oid -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('edbspl', 'sql', 'internal') -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index afa3dcc1dcd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/properties.sql +++ /dev/null @@ -1,37 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('edbspl', 'sql', 'internal') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index f9a2b1c0f3f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/update.sql +++ /dev/null @@ -1,114 +0,0 @@ -{% import 'macros/functions/security.macros' as SECLABEL %} -{% import 'macros/functions/privilege.macros' as PRIVILEGE %} -{% import 'macros/functions/variable.macros' as VARIABLE %}{% if data %} -{% set name = o_data.name %} -{% set exclude_quoting = ['search_path'] %} -{% if data.name %} -{% if data.name != o_data.name %} -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, o_data.name) }}({{ -o_data.proargtypenames }}) - RENAME TO {{ conn|qtIdent(data.name) }}; -{% set name = data.name %} -{% endif %} -{% endif -%} -{% if data.change_func %} - -CREATE OR REPLACE FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}() - RETURNS {{ o_data.prorettypename }} -{% if 'lanname' in data %} - LANGUAGE {{ data.lanname|qtLiteral(conn) }} {% else %} - LANGUAGE {{ o_data.lanname|qtLiteral(conn) }} - {% endif %}{% if 'provolatile' in data and data.provolatile %}{{ data.provolatile }}{% elif 'provolatile' not in data and o_data.provolatile %}{{ o_data.provolatile }}{% endif %} -{% if ('proleakproof' in data and data.proleakproof) or ('proleakproof' not in data and o_data.proleakproof) %} LEAKPROOF{% elif 'proleakproof' in data and not data.proleakproof %} NOT LEAKPROOF{% endif %} -{% if ('proisstrict' in data and data.proisstrict) or ('proisstrict' not in data and o_data.proisstrict) %} STRICT{% endif %} -{% if ('prosecdef' in data and data.prosecdef) or ('prosecdef' not in data and o_data.prosecdef) %} SECURITY DEFINER{% endif %} -{% if ('proiswindow' in data and data.proiswindow) or ('proiswindow' not in data and o_data.proiswindow) %} WINDOW{% endif %} - - {% if data.procost %}COST {{data.procost}}{% elif o_data.procost %}COST {{o_data.procost}}{% endif %}{% if data.prorows %} - - ROWS {{data.prorows}}{% elif data.prorows is not defined and o_data.prorows and o_data.prorows != '0' %} ROWS {{o_data.prorows}} {%endif -%}{% if data.merged_variables %}{% for v in data.merged_variables %} - - SET {{ conn|qtIdent(v.name) }}={% if v.name in exclude_quoting %}{{ v.value }}{% else %}{{ v.value|qtLiteral(conn) }}{% endif %}{% endfor -%} - {% endif %} - -AS {% if (data.lanname == 'c' or o_data.lanname == 'c') and ('probin' in data or 'prosrc_c' in data) %} -{% if 'probin' in data %}{{ data.probin|qtLiteral(conn) }}{% else %}{{ o_data.probin|qtLiteral(conn) }}{% endif %}, {% if 'prosrc_c' in data %}{{ data.prosrc_c|qtLiteral(conn) }}{% else %}{{ o_data.prosrc_c|qtLiteral(conn) }}{% endif %}{% elif 'prosrc' in data %} -$BODY${{ data.prosrc }}$BODY${% elif o_data.lanname == 'c' %} -{{ o_data.probin|qtLiteral(conn) }}, {{ o_data.prosrc_c|qtLiteral(conn) }}{% else %} -$BODY${{ o_data.prosrc }}$BODY${% endif -%}; -{% endif -%} -{% if data.funcowner %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - OWNER TO {{ conn|qtIdent(data.funcowner) }}; -{% endif -%} -{# The SQL generated below will change priviledges #} -{% if data.acl %} -{% if 'deleted' in data.acl %} -{% for priv in data.acl.deleted %} - -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in data.acl %} -{% for priv in data.acl.changed %} - -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.old_grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'FUNCTION', priv.grantee, name, o_data.pronamespace, o_data.proargtypenames) }} -{% endif %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in data.acl %} -{% for priv in data.acl.added %} - -{{ PRIVILEGE.SET(conn, 'FUNCTION', priv.grantee, name, priv.without_grant, priv.with_grant, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %}{% endif -%} -{% endif -%} -{% if data.change_func == False %} -{% if data.variables %} -{% if 'deleted' in data.variables and data.variables.deleted|length > 0 %} - -{{ VARIABLE.UNSET(conn, 'FUNCTION', name, data.variables.deleted, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% if 'merged_variables' in data and data.merged_variables|length > 0 %} - -{{ VARIABLE.SET(conn, 'FUNCTION', name, data.merged_variables, o_data.pronamespace, o_data.proargtypenames) }} -{% endif -%} -{% endif -%} -{% endif -%} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} - -{{ SECLABEL.UNSET(conn, 'FUNCTION', name, r.provider, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} - -{{ SECLABEL.SET(conn, 'FUNCTION', name, r.provider, r.label, o_data.pronamespace, o_data.proargtypenames) }} -{% endfor %} -{% endif -%} -{% if data.description is defined and data.description != o_data.description%} - -COMMENT ON FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - IS {{ data.description|qtLiteral(conn) }}; -{% endif -%} - -{% if data.pronamespace %} - -ALTER FUNCTION {{ conn|qtIdent(o_data.pronamespace, name) }}({{o_data.proargtypenames }}) - SET SCHEMA {{ conn|qtIdent(data.pronamespace) }}; -{% endif -%} - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 index a927a5633a8..ae9079b90d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 @@ -14,7 +14,7 @@ WHERE JOIN pg_catalog.pg_type typ ON typ.oid=p.prorettype WHERE - p.proisagg = FALSE + p.prokind IN ('f', 'w') AND typname = 'trigger' ) ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/count.sql index 18266de9430..0c4e2cd657d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/count.sql @@ -8,7 +8,7 @@ JOIN JOIN pg_catalog.pg_language lng ON lng.oid=prolang WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname IN ('trigger', 'event_trigger') AND lanname NOT IN ('edbspl', 'sql', 'internal') AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/delete.sql index 42bd27f66a4..4eb207cf245 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/delete.sql @@ -10,7 +10,7 @@ JOIN JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND typname IN ('trigger', 'event_trigger') AND pr.oid = {{fnid}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 index 083e294f67b..9a49887784f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 @@ -10,6 +10,6 @@ FROM JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 index 8b1d2410594..1da0793f9a9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 @@ -12,7 +12,7 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname IN ('trigger', 'event_trigger') AND lanname NOT IN ('edbspl', 'sql', 'internal') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/node.sql index 322fdb76e2c..4619bcfcf89 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/node.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/node.sql @@ -10,7 +10,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') {% if fnid %} AND pr.oid = {{ fnid|qtLiteral(conn) }} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/properties.sql index 9679f2c0632..afa3dcc1dcd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/properties.sql @@ -1,12 +1,13 @@ SELECT - pr.oid, pr.xmin, pr.proiswindow, pr.prosrc, pr.prosrc AS prosrc_c, - pr.pronamespace, pr.prolang, pr.procost, pr.prorows, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, + pr.oid, pr.xmin, + CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, + pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, + pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, + pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM @@ -24,7 +25,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname IN ('trigger', 'event_trigger') AND lanname NOT IN ('edbspl', 'sql', 'internal') {% if fnid %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 701810d26f1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/coll_stats.sql +++ /dev/null @@ -1,20 +0,0 @@ -SELECT - funcname AS {{ conn|qtIdent(_('Name')) }}, - calls AS {{ conn|qtIdent(_('Number of calls')) }}, - total_time AS {{ conn|qtIdent(_('Total time')) }}, - self_time AS {{ conn|qtIdent(_('Self time')) }} -FROM - pg_catalog.pg_stat_user_functions -WHERE - schemaname = {{schema_name|qtLiteral(conn)}} - AND funcid IN ( - SELECT p.oid - FROM - pg_catalog.pg_proc p - JOIN - pg_catalog.pg_type typ ON typ.oid=p.prorettype - WHERE - p.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') - ) -ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/count.sql deleted file mode 100644 index 997152d0607..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/count.sql +++ /dev/null @@ -1,13 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -WHERE - pr.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') - AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 4eb207cf245..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/delete.sql +++ /dev/null @@ -1,21 +0,0 @@ -{% if scid and fnid %} -SELECT - pr.proname as name, '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args, - nspname -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND typname IN ('trigger', 'event_trigger') - AND pr.oid = {{fnid}}; -{% endif %} - -{% if name %} -DROP FUNCTION {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 9a49887784f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_definition.sql +++ /dev/null @@ -1,15 +0,0 @@ -SELECT - pg_catalog.pg_get_functiondef({{fnid}}::oid) AS func_def, - COALESCE(pg_catalog.pg_get_function_identity_arguments(pr.oid), '') as - func_with_identity_arguments, - nspname, - pr.proname as proname, - COALESCE(pg_catalog.pg_get_function_arguments(pr.oid), '') as func_args -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -WHERE - pr.prokind IN ('f', 'w') - AND pronamespace = {{scid}}::oid - AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 16a94add6ea..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_oid.sql +++ /dev/null @@ -1,18 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner, pr.pronamespace AS nsp -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('sql', 'internal') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index 0ed66310987..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/node.sql +++ /dev/null @@ -1,26 +0,0 @@ -SELECT - pr.oid, pr.proname || '()' AS name, - lanname, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pr.prokind IN ('f', 'w') -{% if fnid %} - AND pr.oid = {{ fnid|qtLiteral(conn) }} -{% endif %} -{% if scid %} - AND pronamespace = {{scid}}::oid -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - AND typname IN ('trigger', 'event_trigger') -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 deleted file mode 100644 index c9f2fae3bad..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/properties.sql +++ /dev/null @@ -1,36 +0,0 @@ -SELECT - pr.oid, pr.xmin, - CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, - pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, - pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, - pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, - typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, - (SELECT - pg_catalog.array_agg(provider || '=' || label) - FROM - pg_catalog.pg_seclabel sl1 - WHERE - sl1.objoid=pr.oid) AS seclabels -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) -WHERE - pr.prokind IN ('f', 'w') - AND typname IN ('trigger', 'event_trigger') -{% if fnid %} - AND pr.oid = {{fnid}}::oid -{% else %} - AND pronamespace = {{scid}}::oid -{% endif %} -ORDER BY - proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 index a927a5633a8..701810d26f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 @@ -14,7 +14,7 @@ WHERE JOIN pg_catalog.pg_type typ ON typ.oid=p.prorettype WHERE - p.proisagg = FALSE - AND typname = 'trigger' + p.prokind IN ('f', 'w') + AND typname IN ('trigger', 'event_trigger') ) ORDER BY funcname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/count.sql index dd9006c0a38..997152d0607 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/count.sql @@ -8,7 +8,6 @@ JOIN JOIN pg_catalog.pg_language lng ON lng.oid=prolang WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('sql', 'internal') AND pronamespace = {{scid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/delete.sql index 42bd27f66a4..4eb207cf245 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/delete.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/delete.sql @@ -10,7 +10,7 @@ JOIN JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND typname IN ('trigger', 'event_trigger') AND pr.oid = {{fnid}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 index 083e294f67b..9a49887784f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 @@ -10,6 +10,6 @@ FROM JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND pronamespace = {{scid}}::oid AND pr.oid = {{fnid}}::oid; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 index dc94c254369..16a94add6ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/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 @@ -12,7 +12,7 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname IN ('trigger', 'event_trigger') AND lanname NOT IN ('sql', 'internal') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/node.sql index c4ae760aaf5..0ed66310987 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/node.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/node.sql @@ -10,7 +10,7 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') {% if fnid %} AND pr.oid = {{ fnid|qtLiteral(conn) }} {% endif %} @@ -22,6 +22,5 @@ WHERE WHERE objid = pr.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END {% endif %} AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('sql', 'internal') ORDER BY proname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/properties.sql index 8ef144b66bb..c9f2fae3bad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/properties.sql @@ -1,12 +1,13 @@ SELECT - pr.oid, pr.xmin, pr.proiswindow, pr.prosrc, pr.prosrc AS prosrc_c, - pr.pronamespace, pr.prolang, pr.procost, pr.prorows, - pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, + pr.oid, pr.xmin, + CASE WHEN pr.prokind = 'w' THEN true ELSE false END AS proiswindow, + pr.prosrc, pr.prosrc AS prosrc_c, pr.pronamespace, pr.prolang, pr.procost, pr.prorows, pr.prokind, + pr.prosecdef, pr.proleakproof, pr.proisstrict, pr.proretset, pr.provolatile, pr.proparallel, pr.pronargs, pr.prorettype, pr.proallargtypes, pr.proargmodes, pr.probin, pr.proacl, pr.proname, pr.proname AS name, pg_catalog.pg_get_function_result(pr.oid) AS prorettypename, typns.nspname AS typnsp, lanname, proargnames, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, + pr.pronargdefaults, proconfig, pg_catalog.pg_get_userbyid(proowner) AS funcowner, description, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM @@ -24,9 +25,8 @@ JOIN LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass and des.objsubid = 0) WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname IN ('trigger', 'event_trigger') - AND lanname NOT IN ('sql', 'internal') {% if fnid %} AND pr.oid = {{fnid}}::oid {% else %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.msql deleted file mode 100644 index ec0c05ca3dd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.msql +++ /dev/null @@ -1 +0,0 @@ -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.sql deleted file mode 100644 index 3edd8afe804..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_acl.sql +++ /dev/null @@ -1,24 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO ; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.msql deleted file mode 100644 index ae35deb484f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.msql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - VOLATILE - PARALLEL UNSAFE - COST 100 - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.sql deleted file mode 100644 index 012280aeba6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_add_parameter.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.msql deleted file mode 100644 index 62736d979c5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM ; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.sql deleted file mode 100644 index 056fde13b87..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_change_grantee_acl.sql +++ /dev/null @@ -1,21 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.msql deleted file mode 100644 index 12b3a148cf9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.msql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.sql deleted file mode 100644 index c11500fc701..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_comment.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO ; - -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.msql deleted file mode 100644 index 58b1a1823a4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.sql deleted file mode 100644 index 24e4d6e027b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_acl.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.msql deleted file mode 100644 index f215838674c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RESET application_name; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.sql deleted file mode 100644 index 60b527fcdef..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_delete_parameter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.msql deleted file mode 100644 index 8ddfca77bbf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RENAME TO "Function3_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.sql deleted file mode 100644 index 2ba8d51fc85..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_function_rename.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.msql deleted file mode 100644 index 271cf907c6f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.msql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) - LANGUAGE 'plpgsql' - - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM ; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.sql deleted file mode 100644 index 570ee0ea444..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_change_grantee_priv.sql +++ /dev/null @@ -1,21 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_comment.sql deleted file mode 100644 index 9262f15737d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_comment.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_param.sql deleted file mode 100644 index 90935bf0f30..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_param.sql +++ /dev/null @@ -1,19 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_comment.sql deleted file mode 100644 index f33d01d9caa..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_comment.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_1.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_1.sql deleted file mode 100644 index 71b5878fa54..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_1.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - STABLE LEAKPROOF STRICT SECURITY DEFINER -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_2.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_2.sql deleted file mode 100644 index 63170204764..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_2.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_3.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_3.sql deleted file mode 100644 index e061a660b08..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_ptrig_set_3.sql +++ /dev/null @@ -1,23 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname2' - SET search_path=public, pg_catalog - SET array_nulls='true' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_event_trigger_full.sql deleted file mode 100644 index 3fc5f686b58..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_event_trigger_full.sql +++ /dev/null @@ -1,26 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF event_trigger - LANGUAGE 'plpgsql' - COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO WITH GRANT OPTION; - -REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.msql deleted file mode 100644 index 29f67e3601e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(IN param character varying DEFAULT '1') - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.sql deleted file mode 100644 index 3de9ef72b44..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO ; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.msql deleted file mode 100644 index 3ccc0a019a5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.sql deleted file mode 100644 index 24e4d6e027b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_function_for_alter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger.sql deleted file mode 100644 index 15603af8e17..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger.sql +++ /dev/null @@ -1,17 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger_full.sql deleted file mode 100644 index 8436d4ee8fb..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_plain_trigger_full.sql +++ /dev/null @@ -1,27 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF trigger - LANGUAGE 'plpgsql' - COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO WITH GRANT OPTION; - -REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_procedure.sql deleted file mode 100644 index 407b2cc3e2c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/create_procedure.sql +++ /dev/null @@ -1,15 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_function.json deleted file mode 100644 index 304714dba7f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_function.json +++ /dev/null @@ -1,354 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql", - "expected_msql_file": "alter_function_add_parameter.msql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_procedures.json deleted file mode 100644 index 90035bb6be3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_procedures.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [ - { - "argtype": "integer", - "argmode": "IN", - "argname": "i1", - "argdefval": "" - } - ], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql" - }, - { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "variables": { - "added": [ - { - "name": "application_name", - "value": "pgadmin" - } - ] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_trigger_functions.json deleted file mode 100644 index 3d0a0939635..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/test_trigger_functions.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger.sql" - }, - { - "type": "alter", - "name": "Alter trigger function comment", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_ptrig_comment.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 1 - Strict, Leakproof, Security of definer, Volatility", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "proisstrict": true, - "proleakproof": true, - "prosecdef": true, - "provolatile": "s" - }, - "expected_sql_file": "alter_ptrig_set_1.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 2 - Cost, Volatility, Add Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "procost": "123", - "provolatile": "i", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - }, - { - "name": "search_path", - "value": "public, pg_temp" - } - ] - } - }, - "expected_sql_file": "alter_ptrig_set_2.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 3 - Add Param, Change Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname2" - } - ], - "changed": [ - { - "name": "array_nulls", - "value": true - }, - { - "name": "search_path", - "value": "public, pg_catalog" - } - ] - } - }, - "expected_sql_file": "alter_ptrig_set_3.sql" - }, - { - "type": "delete", - "name": "Drop trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create full fledged trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - } - ], - "args": [], - "description": "some comment", - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [ - { - "name": "application_name", - "value": "appname" - }, - { - "name": "search_path", - "value": "public, pg_temp" - } - ], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_full.sql" - }, - { - "type": "delete", - "name": "Drop full fledged trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create full fledged event trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - } - ], - "args": [], - "description": "some comment", - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "event_trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [ - { - "name": "application_name", - "value": "appname" - } - ], - "schema": "public" - }, - "expected_sql_file": "create_event_trigger_full.sql" - }, - { - "type": "delete", - "name": "Drop full fledged event trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.msql deleted file mode 100644 index ec0c05ca3dd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.msql +++ /dev/null @@ -1 +0,0 @@ -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.sql deleted file mode 100644 index 3edd8afe804..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_acl.sql +++ /dev/null @@ -1,24 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO ; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.msql deleted file mode 100644 index 2102c333eec..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - VOLATILE - PARALLEL UNSAFE - COST 100 - - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.sql deleted file mode 100644 index 012280aeba6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_add_parameter.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.msql deleted file mode 100644 index 62736d979c5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM ; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.sql deleted file mode 100644 index 056fde13b87..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_change_grantee_acl.sql +++ /dev/null @@ -1,21 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.msql deleted file mode 100644 index 12b3a148cf9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.msql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.sql deleted file mode 100644 index c11500fc701..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_comment.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO ; - -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.msql deleted file mode 100644 index 58b1a1823a4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.sql deleted file mode 100644 index 24e4d6e027b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_acl.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.msql deleted file mode 100644 index f215838674c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RESET application_name; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.sql deleted file mode 100644 index 60b527fcdef..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_delete_parameter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.msql deleted file mode 100644 index 8ddfca77bbf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RENAME TO "Function3_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.sql deleted file mode 100644 index 2ba8d51fc85..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_function_rename.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_add_priv.sql deleted file mode 100644 index 710a64e059b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_add_priv.sql +++ /dev/null @@ -1,23 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO ; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_change_grantee_priv.sql deleted file mode 100644 index 570ee0ea444..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_change_grantee_priv.sql +++ /dev/null @@ -1,21 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment.sql deleted file mode 100644 index 9262f15737d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment_msql.sql deleted file mode 100644 index d48fca1bfbe..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_comment_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_delete_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_delete_priv.sql deleted file mode 100644 index 15d468d3767..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_delete_priv.sql +++ /dev/null @@ -1,23 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO ; - -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param.sql deleted file mode 100644 index 90935bf0f30..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param.sql +++ /dev/null @@ -1,19 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param_msql.sql deleted file mode 100644 index 52c0f9c51c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_param_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - SET application_name=pgadmin; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_comment.sql deleted file mode 100644 index f33d01d9caa..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_comment.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_1.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_1.sql deleted file mode 100644 index 71b5878fa54..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_1.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - STABLE LEAKPROOF STRICT SECURITY DEFINER -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_2.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_2.sql deleted file mode 100644 index 63170204764..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_2.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_3.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_3.sql deleted file mode 100644 index e061a660b08..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_ptrig_set_3.sql +++ /dev/null @@ -1,23 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname2' - SET search_path=public, pg_catalog - SET array_nulls='true' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_event_trigger_full.sql deleted file mode 100644 index b16e1a68e38..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_event_trigger_full.sql +++ /dev/null @@ -1,26 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF event_trigger - LANGUAGE 'plpgsql' - COST 1234 - STABLE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO WITH GRANT OPTION; - -REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.msql deleted file mode 100644 index 29f67e3601e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(IN param character varying DEFAULT '1') - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.sql deleted file mode 100644 index 3de9ef72b44..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO ; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.msql deleted file mode 100644 index 3ccc0a019a5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.sql deleted file mode 100644 index 24e4d6e027b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_function_for_alter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger.sql deleted file mode 100644 index 15603af8e17..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger.sql +++ /dev/null @@ -1,17 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger_full.sql deleted file mode 100644 index bc448f6b07e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_plain_trigger_full.sql +++ /dev/null @@ -1,27 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF trigger - LANGUAGE 'plpgsql' - COST 1234 - STABLE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO ; - -GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO WITH GRANT OPTION; - -REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.msql deleted file mode 100644 index e7c23fd4f56..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.msql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.sql deleted file mode 100644 index 407b2cc3e2c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/create_procedure.sql +++ /dev/null @@ -1,15 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_function.json deleted file mode 100644 index ac0348d8465..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_function.json +++ /dev/null @@ -1,356 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql", - "expected_msql_file": "alter_function_add_parameter.msql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_func_remove_partial_pri.sql", - "expected_msql_file": "alter_func_remove_partial_pri.msql" - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_procedures.json deleted file mode 100644 index 9550cbb55e3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_procedures.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [ - { - "argtype": "integer", - "argmode": "IN", - "argname": "i1", - "argdefval": "" - } - ], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql", - "expected_msql_file": "create_procedure.msql" - }, - { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "variables": { - "added": [ - { - "name": "application_name", - "value": "pgadmin" - } - ] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_add_priv.sql", - "expected_msql_file": "alter_proc_add_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_delete_priv.sql", - "expected_msql_file": "alter_proc_delete_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_trigger_functions.json deleted file mode 100644 index a8b3b078c32..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/test_trigger_functions.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger.sql" - }, - { - "type": "alter", - "name": "Alter trigger function comment", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_ptrig_comment.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 1 - Strict, Leakproof, Security of definer, Volatility", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "proisstrict": true, - "proleakproof": true, - "prosecdef": true, - "provolatile": "s" - }, - "expected_sql_file": "alter_ptrig_set_1.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 2 - Cost, Volatility, Add Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "procost": "123", - "provolatile": "i", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - }, - { - "name": "search_path", - "value": "public, pg_temp" - } - ] - } - }, - "expected_sql_file": "alter_ptrig_set_2.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 3 - Add Param, Change Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname2" - } - ], - "changed": [ - { - "name": "array_nulls", - "value": true - }, - { - "name": "search_path", - "value": "public, pg_catalog" - } - ] - } - }, - "expected_sql_file": "alter_ptrig_set_3.sql" - }, - { - "type": "delete", - "name": "Drop trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create full fledged trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - } - ], - "args": [], - "description": "some comment", - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "s", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [ - { - "name": "application_name", - "value": "appname" - }, - { - "name": "search_path", - "value": "public, pg_temp" - } - ], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_full.sql" - }, - { - "type": "delete", - "name": "Drop full fledged trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create full fledged event trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - } - ], - "args": [], - "description": "some comment", - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "event_trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "s", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [ - { - "name": "application_name", - "value": "appname" - } - ], - "schema": "public" - }, - "expected_sql_file": "create_event_trigger_full.sql" - }, - { - "type": "delete", - "name": "Drop full fledged event trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_proc_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_proc_no_depends.sql deleted file mode 100644 index d57a09fab70..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_proc_no_depends.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION plpgsql; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.msql deleted file mode 100644 index 07c2e9739af..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.msql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION plpgsql; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION postgres_fdw; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.sql deleted file mode 100644 index 8a4316762f5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_procedure_on_depends.sql +++ /dev/null @@ -1,21 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO ; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION plpgsql; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION postgres_fdw; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_function.json deleted file mode 100644 index 7b7dd946596..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_function.json +++ /dev/null @@ -1,448 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create function with extensions.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "dependsonextensions": [ - "plpgsql", - "postgres_fdw" - ], - "schema": "public" - }, - "expected_sql_file": "create_function_on_depends.sql", - "expected_msql_file": "create_function_on_depends.msql" - }, - { - "type": "alter", - "name": "Alter function with NO DEPENDS ON", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "dependsonextensions": [ - "plpgsql" - ] - }, - "expected_sql_file": "alter_function_no_depends.sql", - "expected_msql_file": "alter_function_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [ - "" - ] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql", - "expected_msql_file": "alter_function_add_parameter.msql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_func_remove_partial_pri.sql", - "expected_msql_file": "alter_func_remove_partial_pri.msql" - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_procedures.json deleted file mode 100644 index a684930d4c4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/test_procedures.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create procedure with extensions.", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [ - { - "argtype": "integer", - "argmode": "IN", - "argname": "i1", - "argdefval": "" - } - ], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/", - "dependsonextensions": [ - "plpgsql", - "postgres_fdw" - ] - }, - "expected_sql_file": "create_procedure_on_depends.sql", - "expected_msql_file": "create_procedure_on_depends.msql" - }, - { - "type": "alter", - "name": "Alter procedure with NO DEPENDS ON", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "dependsonextensions": [ - "plpgsql" - ] - }, - "expected_sql_file": "alter_proc_no_depends.sql", - "expected_msql_file": "alter_proc_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": {} - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [ - "" - ] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [ - { - "argtype": "integer", - "argmode": "IN", - "argname": "i1", - "argdefval": "" - } - ], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql", - "expected_msql_file": "create_procedure.msql" - }, - { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "variables": { - "added": [ - { - "name": "application_name", - "value": "pgadmin" - } - ] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_add_priv.sql", - "expected_msql_file": "alter_proc_add_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_delete_priv.sql", - "expected_msql_file": "alter_proc_delete_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_add_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_add_priv.msql deleted file mode 100644 index 5585c1eaa9e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_add_priv.msql +++ /dev/null @@ -1,3 +0,0 @@ -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO ; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_function.json deleted file mode 100644 index a4ce7162496..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_function.json +++ /dev/null @@ -1,487 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create function with extensions.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "dependsonextensions": [ - "plpgsql", - "postgres_fdw" - ], - "schema": "public" - }, - "expected_sql_file": "create_function_on_depends.sql", - "expected_msql_file": "create_function_on_depends.msql" - }, - { - "type": "alter", - "name": "Alter function with NO DEPENDS ON", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "dependsonextensions": [ - "plpgsql" - ] - }, - "expected_sql_file": "alter_function_no_depends.sql", - "expected_msql_file": "alter_function_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [ - "" - ] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql", - "expected_msql_file": "alter_function_add_parameter.msql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_func_remove_partial_pri.sql", - "expected_msql_file": "alter_func_remove_partial_pri.msql" - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function (atomic).", - "store_object_id": "True", - "data": { - "name": "Function4_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "numeric", - "lanname": "sql", - "prorows": 0, - "arguments": [], - "prosrc": "begin atomic\n select 1;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "prosecdef": true, - "acl": [], - "provolatile": "v", - "proisstrict": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "proleakproof": true, - "schema": "public" - }, - "expected_sql_file": "create_atomic_func.sql", - "expected_msql_file": "create_atomic_func.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_trigger_functions.json deleted file mode 100644 index a8b3b078c32..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_trigger_functions.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger.sql" - }, - { - "type": "alter", - "name": "Alter trigger function comment", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_ptrig_comment.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 1 - Strict, Leakproof, Security of definer, Volatility", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "proisstrict": true, - "proleakproof": true, - "prosecdef": true, - "provolatile": "s" - }, - "expected_sql_file": "alter_ptrig_set_1.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 2 - Cost, Volatility, Add Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "procost": "123", - "provolatile": "i", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - }, - { - "name": "search_path", - "value": "public, pg_temp" - } - ] - } - }, - "expected_sql_file": "alter_ptrig_set_2.sql" - }, - { - "type": "alter", - "name": "Alter trigger function Set 3 - Add Param, Change Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname2" - } - ], - "changed": [ - { - "name": "array_nulls", - "value": true - }, - { - "name": "search_path", - "value": "public, pg_catalog" - } - ] - } - }, - "expected_sql_file": "alter_ptrig_set_3.sql" - }, - { - "type": "delete", - "name": "Drop trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create full fledged trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - } - ], - "args": [], - "description": "some comment", - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "s", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [ - { - "name": "application_name", - "value": "appname" - }, - { - "name": "search_path", - "value": "public, pg_temp" - } - ], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_full.sql" - }, - { - "type": "delete", - "name": "Drop full fledged trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - }, - { - "type": "create", - "name": "Create full fledged event trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - } - ], - "args": [], - "description": "some comment", - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "event_trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "s", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [ - { - "name": "application_name", - "value": "appname" - } - ], - "schema": "public" - }, - "expected_sql_file": "create_event_trigger_full.sql" - }, - { - "type": "delete", - "name": "Drop full fledged event trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_func_remove_partial_pri.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_func_remove_partial_pri.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_func_remove_partial_pri.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_func_remove_partial_pri.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_func_remove_partial_pri.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_func_remove_partial_pri.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_func_remove_partial_pri.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_func_remove_partial_pri.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_add_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_add_parameter.msql index ae35deb484f..2102c333eec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_add_parameter.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_add_parameter.msql @@ -4,6 +4,7 @@ CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() VOLATILE PARALLEL UNSAFE COST 100 + SET application_name='appname' SET enable_sort='true' AS $BODY$ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_function_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_function_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_function_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_function_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_function_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_add_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_add_priv.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_add_priv.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_add_priv.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_add_priv.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_add_priv.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_add_priv.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_change_grantee_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_change_grantee_priv.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_change_grantee_priv.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_change_grantee_priv.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_change_grantee_priv.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_change_grantee_priv.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_change_grantee_priv.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_comment.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_comment.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_comment.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_comment_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_comment_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_comment_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_comment_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_delete_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_delete_priv.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/12_plus/alter_proc_delete_priv.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_delete_priv.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_delete_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_delete_priv.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_delete_priv.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_delete_priv.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_proc_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/alter_proc_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_param.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_param.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_param.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_param_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_param_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/11_plus/alter_proc_param_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_proc_param_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_func.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_func.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_func.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_func.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_func.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_func.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_func.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_func.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_proc.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_proc.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_proc.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_proc.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_proc.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_proc.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_atomic_proc.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_atomic_proc.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql index 3fc5f686b58..b16e1a68e38 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql @@ -6,7 +6,7 @@ CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() RETURNS SETOF event_trigger LANGUAGE 'plpgsql' COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW + STABLE LEAKPROOF STRICT SECURITY DEFINER WINDOW ROWS 4321 SET application_name='appname' AS $BODY$ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_function_on_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_function_on_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_function_on_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_function_on_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_function_on_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_function_on_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/13_plus/create_function_on_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_function_on_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql index 8436d4ee8fb..bc448f6b07e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql @@ -6,7 +6,7 @@ CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() RETURNS SETOF trigger LANGUAGE 'plpgsql' COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW + STABLE LEAKPROOF STRICT SECURITY DEFINER WINDOW ROWS 4321 SET application_name='appname' SET search_path=public, pg_temp diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure_on_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure_on_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure_on_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure_on_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure_on_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure_on_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/create_procedure_on_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_procedure_on_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_function.json index 5ecb2f03e4c..a4ce7162496 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_function.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_function.json @@ -1,5 +1,97 @@ { "scenarios": [ + { + "type": "create", + "name": "Create Extension", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "postgres_fdw", + "version": "", + "relocatable": true + }, + "store_object_id": true + }, + { + "type": "create", + "name": "Create function with extensions.", + "endpoint": "NODE-function.obj", + "msql_endpoint": "NODE-function.msql", + "sql_endpoint": "NODE-function.sql_id", + "data": { + "name": "Function1_$%{}[]()&*^!@\"'`\\/#", + "funcowner": "", + "pronamespace": 2200, + "prorettypename": "character varying", + "lanname": "plpgsql", + "provolatile": "v", + "proretset": false, + "proisstrict": true, + "prosecdef": true, + "proiswindow": true, + "proparallel": "u", + "procost": "100", + "prorows": "0", + "proleakproof": true, + "arguments": [ + { + "argtype": "character varying", + "argmode": "IN", + "argname": "param", + "argdefval": "'1'" + } + ], + "prosrc": "begin\nselect '1';\nend", + "probin": "$libdir/", + "options": [], + "variables": [ + { + "name": "enable_sort", + "value": true + } + ], + "seclabels": [], + "acl": [], + "dependsonextensions": [ + "plpgsql", + "postgres_fdw" + ], + "schema": "public" + }, + "expected_sql_file": "create_function_on_depends.sql", + "expected_msql_file": "create_function_on_depends.msql" + }, + { + "type": "alter", + "name": "Alter function with NO DEPENDS ON", + "endpoint": "NODE-function.obj_id", + "msql_endpoint": "NODE-function.msql_id", + "sql_endpoint": "NODE-function.sql_id", + "data": { + "dependsonextensions": [ + "plpgsql" + ] + }, + "expected_sql_file": "alter_function_no_depends.sql", + "expected_msql_file": "alter_function_no_depends.msql" + }, + { + "type": "delete", + "name": "Drop function", + "endpoint": "NODE-function.delete_id", + "data": {} + }, + { + "type": "delete", + "name": "Drop Extension", + "endpoint": "NODE-extension.delete", + "data": { + "ids": [ + "" + ] + }, + "preprocess_data": true + }, { "type": "create", "name": "Create function with all options.", @@ -232,7 +324,9 @@ } ] } - } + }, + "expected_sql_file": "alter_func_remove_partial_pri.sql", + "expected_msql_file": "alter_func_remove_partial_pri.msql" }, { "type": "alter", @@ -304,6 +398,45 @@ "endpoint": "NODE-function.delete_id", "data": {} }, + { + "type": "create", + "endpoint": "NODE-function.obj", + "msql_endpoint": "NODE-function.msql", + "sql_endpoint": "NODE-function.sql_id", + "name": "Create function (atomic).", + "store_object_id": "True", + "data": { + "name": "Function4_$%{}[]()&*^!@\"'`\\/#", + "funcowner": "", + "pronamespace": 2200, + "prorettypename": "numeric", + "lanname": "sql", + "prorows": 0, + "arguments": [], + "prosrc": "begin atomic\n select 1;\nend", + "probin": "$libdir/", + "options": [], + "variables": [], + "seclabels": [], + "prosecdef": true, + "acl": [], + "provolatile": "v", + "proisstrict": true, + "proiswindow": true, + "proparallel": "u", + "procost": "100", + "proleakproof": true, + "schema": "public" + }, + "expected_sql_file": "create_atomic_func.sql", + "expected_msql_file": "create_atomic_func.msql" + }, + { + "type": "delete", + "name": "Drop function", + "endpoint": "NODE-function.delete_id", + "data": {} + }, { "type": "create", "endpoint": "NODE-function.obj", @@ -333,7 +466,7 @@ "argdefval": "'1'" } ], - "prosrc": "begin\n return query select '1'::character varying;\nend", + "prosrc": "begin\n return query select '1'::character varying;\nend", "probin": "$libdir/", "options": [], "variables": [], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_procedures.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/test_procedures.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_procedures.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_trigger_functions.json index 3d0a0939635..a8b3b078c32 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_trigger_functions.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/test_trigger_functions.json @@ -134,7 +134,7 @@ "prorettypename": "trigger", "prorows": "4321", "prosecdef": true, - "provolatile": "v", + "provolatile": "s", "prosrc": "begin\nselect 1;\nend;", "seclabels": [], "variables": [ @@ -191,7 +191,7 @@ "prorettypename": "event_trigger", "prorows": "4321", "prosecdef": true, - "provolatile": "v", + "provolatile": "s", "prosrc": "begin\nselect 1;\nend;", "seclabels": [], "variables": [ diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.msql deleted file mode 100644 index f5f875cd999..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.sql deleted file mode 100644 index fbaab278e42..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_acl.sql +++ /dev/null @@ -1,24 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO enterprisedb; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.msql deleted file mode 100644 index 900e3a9cd03..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.msql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - VOLATILE SECURITY DEFINER - - COST 100 - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.sql deleted file mode 100644 index e68ca8a3248..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_add_parameter.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.msql deleted file mode 100644 index 0333fa578a1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.sql deleted file mode 100644 index 53a6d190f00..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_change_grantee_acl.sql +++ /dev/null @@ -1,21 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.msql deleted file mode 100644 index 12b3a148cf9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.msql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.sql deleted file mode 100644 index 585fd01084f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_comment.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.msql deleted file mode 100644 index 13bb67bf4e6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.sql deleted file mode 100644 index 87c9237ddf6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_acl.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.msql deleted file mode 100644 index f215838674c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RESET application_name; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.sql deleted file mode 100644 index 31a37a1d0ce..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_delete_parameter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.msql deleted file mode 100644 index 8ddfca77bbf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RENAME TO "Function3_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.sql deleted file mode 100644 index 5da7704953b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_function_rename.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.msql deleted file mode 100644 index 5577b14cc47..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.msql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) - LANGUAGE 'plpgsql' - - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.sql deleted file mode 100644 index 41a96510a4f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_change_grantee_priv.sql +++ /dev/null @@ -1,21 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment.sql deleted file mode 100644 index 52a21fbaae8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment_msql.sql deleted file mode 100644 index d48fca1bfbe..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_comment_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param.sql deleted file mode 100644 index 6b640a0840d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param.sql +++ /dev/null @@ -1,19 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param_msql.sql deleted file mode 100644 index 52c0f9c51c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_proc_param_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - SET application_name=pgadmin; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_comment.sql deleted file mode 100644 index 15673504488..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_comment.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_1.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_1.sql deleted file mode 100644 index 1981336d0d0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_1.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - STABLE LEAKPROOF STRICT SECURITY DEFINER -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_2.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_2.sql deleted file mode 100644 index b4c873f4ce2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_2.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_3.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_3.sql deleted file mode 100644 index e5d4ae97090..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/alter_ptrig_set_3.sql +++ /dev/null @@ -1,23 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname2' - SET search_path=public, pg_catalog - SET array_nulls='true' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_event_trigger_full.sql deleted file mode 100644 index 4950ef5a618..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_event_trigger_full.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF event_trigger - LANGUAGE 'plpgsql' - COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.msql deleted file mode 100644 index 220c35f65b4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(IN param character varying DEFAULT '1') - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.sql deleted file mode 100644 index 1dede6255b9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.msql deleted file mode 100644 index add31f6e3c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.sql deleted file mode 100644 index 87c9237ddf6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_function_for_alter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger.sql deleted file mode 100644 index a794a288a29..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger.sql +++ /dev/null @@ -1,17 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger_full.sql deleted file mode 100644 index e74efbcc65e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_plain_trigger_full.sql +++ /dev/null @@ -1,23 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF trigger - LANGUAGE 'plpgsql' - COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_procedure.sql deleted file mode 100644 index 77b2a0cf028..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/create_procedure.sql +++ /dev/null @@ -1,15 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_function.json deleted file mode 100644 index 0187b401155..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_function.json +++ /dev/null @@ -1,370 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_procedures.json deleted file mode 100644 index ed8de04271e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_procedures.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql" - }, { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "variables": { - "added": [{"name": "application_name", "value": "pgadmin"}] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_trigger_functions.json deleted file mode 100644 index da99d9d4c6b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/11_plus/test_trigger_functions.json +++ /dev/null @@ -1,171 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger.sql" - }, { - "type": "alter", - "name": "Alter trigger function comment", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_ptrig_comment.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 1 - Strict, Leakproof, Security of definer, Volatility", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "proisstrict": true, - "proleakproof": true, - "prosecdef": true, - "provolatile": "s" - }, - "expected_sql_file": "alter_ptrig_set_1.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 2 - Cost, Volatility, Add Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "procost": "123", - "provolatile": "i", - "variables": { - "added": [{ - "name": "application_name", - "value": "appname" - },{ - "name": "search_path", - "value": "public, pg_temp" - }] - } - }, - "expected_sql_file": "alter_ptrig_set_2.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 3 - Add Param, Change Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "variables": { - "changed": [{ - "name": "application_name", - "value": "appname2" - },{ - "name": "search_path", - "value": "public, pg_catalog" - }], - "added": [{ - "name": "array_nulls", - "value": true - }] - } - }, - "expected_sql_file": "alter_ptrig_set_3.sql" - }, { - "type": "delete", - "name": "Drop trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - }, { - "type": "create", - "name": "Create full fledged trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "description": "some comment", - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [{ - "name": "application_name", - "value": "appname" - },{ - "name": "search_path", - "value": "public, pg_temp" - }], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_full.sql" - }, { - "type": "delete", - "name": "Drop full fledged trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - }, { - "type": "create", - "name": "Create full fledged event trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "description": "some comment", - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "event_trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [{ - "name": "application_name", - "value": "appname" - }], - "schema": "public" - }, - "expected_sql_file": "create_event_trigger_full.sql" - }, { - "type": "delete", - "name": "Drop full fledged event trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.msql deleted file mode 100644 index f5f875cd999..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.sql deleted file mode 100644 index fbaab278e42..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_acl.sql +++ /dev/null @@ -1,24 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO enterprisedb; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.msql deleted file mode 100644 index 0b48852ba37..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - VOLATILE SECURITY DEFINER - PARALLEL UNSAFE - COST 100 - - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.sql deleted file mode 100644 index e68ca8a3248..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_add_parameter.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET application_name='appname' - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.msql deleted file mode 100644 index 0333fa578a1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.sql deleted file mode 100644 index 53a6d190f00..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_change_grantee_acl.sql +++ /dev/null @@ -1,21 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.msql deleted file mode 100644 index 12b3a148cf9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.msql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.sql deleted file mode 100644 index 585fd01084f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_comment.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - IS 'Some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.msql deleted file mode 100644 index 13bb67bf4e6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -REVOKE ALL ON FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() FROM enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.sql deleted file mode 100644 index 87c9237ddf6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_acl.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.msql deleted file mode 100644 index f215838674c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - RESET application_name; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.sql deleted file mode 100644 index 31a37a1d0ce..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_delete_parameter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '2'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.msql deleted file mode 100644 index 8ddfca77bbf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RENAME TO "Function3_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.sql deleted file mode 100644 index 5da7704953b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_function_rename.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function3_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function3_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_add_priv.sql deleted file mode 100644 index 0deb3c0f07f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_add_priv.sql +++ /dev/null @@ -1,23 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.msql deleted file mode 100644 index be3dbd0a66a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.msql +++ /dev/null @@ -1,3 +0,0 @@ -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.sql deleted file mode 100644 index 41a96510a4f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_change_grantee_priv.sql +++ /dev/null @@ -1,21 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment.sql deleted file mode 100644 index 52a21fbaae8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment_msql.sql deleted file mode 100644 index d48fca1bfbe..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_comment_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.msql deleted file mode 100644 index b1662bf7f1a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.msql +++ /dev/null @@ -1 +0,0 @@ -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM PUBLIC; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.sql deleted file mode 100644 index 6595b00c849..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_delete_priv.sql +++ /dev/null @@ -1,23 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO enterprisedb; - -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param.sql deleted file mode 100644 index 6b640a0840d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param.sql +++ /dev/null @@ -1,19 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param_msql.sql deleted file mode 100644 index 52c0f9c51c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_param_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - SET application_name=pgadmin; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_comment.sql deleted file mode 100644 index 15673504488..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_comment.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_1.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_1.sql deleted file mode 100644 index 1981336d0d0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_1.sql +++ /dev/null @@ -1,20 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - STABLE LEAKPROOF STRICT SECURITY DEFINER -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_2.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_2.sql deleted file mode 100644 index b4c873f4ce2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_2.sql +++ /dev/null @@ -1,22 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_3.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_3.sql deleted file mode 100644 index e5d4ae97090..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_ptrig_set_3.sql +++ /dev/null @@ -1,23 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 123 - IMMUTABLE LEAKPROOF STRICT SECURITY DEFINER - SET application_name='appname2' - SET search_path=public, pg_catalog - SET array_nulls='true' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_event_trigger_full.sql deleted file mode 100644 index f10c8cc5f60..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_event_trigger_full.sql +++ /dev/null @@ -1,26 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF event_trigger - LANGUAGE 'plpgsql' - COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO enterprisedb WITH GRANT OPTION; - -REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.msql deleted file mode 100644 index 220c35f65b4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(IN param character varying DEFAULT '1') - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.sql deleted file mode 100644 index 1dede6255b9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function1_$%{}[]()&*^!@"'`\/#(character varying) - --- DROP FUNCTION IF EXISTS public."Function1_$%{}[]()&*^!@""'`\/#"(character varying); - -CREATE OR REPLACE FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"( - param character varying DEFAULT '1'::character varying) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function1_$%{}[]()&*^!@""'`\/#"(character varying) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.msql deleted file mode 100644 index add31f6e3c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.msql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort=true -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.sql deleted file mode 100644 index 87c9237ddf6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_function_for_alter.sql +++ /dev/null @@ -1,19 +0,0 @@ --- FUNCTION: public.Function2_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Function2_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"( - ) - RETURNS character varying - LANGUAGE 'plpgsql' - COST 100 - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - SET enable_sort='true' -AS $BODY$ -begin -select '1'; -end -$BODY$; - -ALTER FUNCTION public."Function2_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger.sql deleted file mode 100644 index a794a288a29..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger.sql +++ /dev/null @@ -1,17 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS trigger - LANGUAGE 'plpgsql' - COST 100 - VOLATILE NOT LEAKPROOF -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger_full.sql deleted file mode 100644 index b47c38bd7d9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_plain_trigger_full.sql +++ /dev/null @@ -1,27 +0,0 @@ --- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() - --- DROP FUNCTION IF EXISTS public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - RETURNS SETOF trigger - LANGUAGE 'plpgsql' - COST 1234 - VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW - ROWS 4321 - SET application_name='appname' - SET search_path=public, pg_temp -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - OWNER TO enterprisedb; - -GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO enterprisedb WITH GRANT OPTION; - -REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; - -COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.msql deleted file mode 100644 index 96271e0e22c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.msql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.sql deleted file mode 100644 index 77b2a0cf028..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/create_procedure.sql +++ /dev/null @@ -1,15 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_function.json deleted file mode 100644 index 98649f2287f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_function.json +++ /dev/null @@ -1,372 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_func_remove_partial_pri.sql", - "expected_msql_file": "alter_func_remove_partial_pri.msql" - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_procedures.json deleted file mode 100644 index ed8de04271e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_procedures.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql" - }, { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "variables": { - "added": [{"name": "application_name", "value": "pgadmin"}] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_trigger_functions.json deleted file mode 100644 index 3f20cf80116..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/test_trigger_functions.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger.sql" - }, { - "type": "alter", - "name": "Alter trigger function comment", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_ptrig_comment.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 1 - Strict, Leakproof, Security of definer, Volatility", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "proisstrict": true, - "proleakproof": true, - "prosecdef": true, - "provolatile": "s" - }, - "expected_sql_file": "alter_ptrig_set_1.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 2 - Cost, Volatility, Add Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "procost": "123", - "provolatile": "i", - "variables": { - "added": [{ - "name": "application_name", - "value": "appname" - },{ - "name": "search_path", - "value": "public, pg_temp" - }] - } - }, - "expected_sql_file": "alter_ptrig_set_2.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 3 - Add Param, Change Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "variables": { - "added": [{ - "name": "application_name", - "value": "appname2" - }], - "changed": [{ - "name": "array_nulls", - "value": true - },{ - "name": "search_path", - "value": "public, pg_catalog" - }] - } - }, - "expected_sql_file": "alter_ptrig_set_3.sql" - }, { - "type": "delete", - "name": "Drop trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - }, { - "type": "create", - "name": "Create full fledged trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [{ - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - }], - "args": [], - "description": "some comment", - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [{ - "name": "application_name", - "value": "appname" - },{ - "name": "search_path", - "value": "public, pg_temp" - }], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_full.sql" - }, { - "type": "delete", - "name": "Drop full fledged trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - }, { - "type": "create", - "name": "Create full fledged event trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [{ - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - }], - "args": [], - "description": "some comment", - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "event_trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [{ - "name": "application_name", - "value": "appname" - }], - "schema": "public" - }, - "expected_sql_file": "create_event_trigger_full.sql" - }, { - "type": "delete", - "name": "Drop full fledged event trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.msql deleted file mode 100644 index b7e7249418d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - NO DEPENDS ON EXTENSION postgres_fdw; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.sql deleted file mode 100644 index 3290c13f158..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_proc_no_depends.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION plpgsql; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.msql deleted file mode 100644 index b826da50ac1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.msql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION plpgsql; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION postgres_fdw; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.sql deleted file mode 100644 index b715b914e92..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_procedure_on_depends.sql +++ /dev/null @@ -1,21 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION plpgsql; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - DEPENDS ON EXTENSION postgres_fdw; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_function.json deleted file mode 100644 index 5f5c3b59a44..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_function.json +++ /dev/null @@ -1,459 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create function with extensions.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "dependsonextensions": ["plpgsql", "postgres_fdw"], - "schema": "public" - }, - "expected_sql_file": "create_function_on_depends.sql", - "expected_msql_file": "create_function_on_depends.msql" - }, - { - "type": "alter", - "name": "Alter function with NO DEPENDS ON", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "dependsonextensions": ["plpgsql"] - }, - "expected_sql_file": "alter_function_no_depends.sql", - "expected_msql_file": "alter_function_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [""] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql", - "expected_msql_file": "alter_function_add_parameter.msql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_func_remove_partial_pri.sql", - "expected_msql_file": "alter_func_remove_partial_pri.msql" - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_procedures.json deleted file mode 100644 index a5449a5bc00..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/test_procedures.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql", - "expected_msql_file": "create_procedure.msql" - }, - { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "variables": { - "added": [{"name": "application_name", "value": "pgadmin"}] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_add_priv.sql", - "expected_msql_file": "alter_proc_add_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_delete_priv.sql", - "expected_msql_file": "alter_proc_delete_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_add_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_add_priv.msql deleted file mode 100644 index 23bc0f422af..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_add_priv.msql +++ /dev/null @@ -1,3 +0,0 @@ -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO enterprisedb; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_change_grantee_priv.sql deleted file mode 100644 index 658111d4aaf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_change_grantee_priv.sql +++ /dev/null @@ -1,20 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - IN i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_comment.sql deleted file mode 100644 index 61485c88215..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_comment.sql +++ /dev/null @@ -1,17 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - IN i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_delete_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_delete_priv.msql deleted file mode 100644 index b1662bf7f1a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_delete_priv.msql +++ /dev/null @@ -1 +0,0 @@ -REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM PUBLIC; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_no_depends.msql deleted file mode 100644 index b7e7249418d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_no_depends.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - NO DEPENDS ON EXTENSION postgres_fdw; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_param.sql deleted file mode 100644 index 5d7491f4188..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_param.sql +++ /dev/null @@ -1,18 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - IN i1 integer) -LANGUAGE 'plpgsql' - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; - -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure.sql deleted file mode 100644 index bce3f5e11a4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure.sql +++ /dev/null @@ -1,14 +0,0 @@ --- PROCEDURE: public.Proc1_$%{}[]()&*^!@"'`\/#(integer) - --- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); - -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - IN i1 integer) -LANGUAGE 'plpgsql' -AS $BODY$ -begin -select 1; -end; -$BODY$; -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) - OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_function.json deleted file mode 100644 index 03ac4022308..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_function.json +++ /dev/null @@ -1,499 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create function with extensions.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "dependsonextensions": ["plpgsql", "postgres_fdw"], - "schema": "public" - }, - "expected_sql_file": "create_function_on_depends.sql", - "expected_msql_file": "create_function_on_depends.msql" - }, - { - "type": "alter", - "name": "Alter function with NO DEPENDS ON", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "dependsonextensions": ["plpgsql"] - }, - "expected_sql_file": "alter_function_no_depends.sql", - "expected_msql_file": "alter_function_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [""] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create function with all options.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function1_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function.sql", - "expected_msql_file": "create_function.msql" - }, - { - "type": "alter", - "name": "Alter function comment", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "description": "Some comment" - }, - "expected_sql_file": "alter_function_comment.sql", - "expected_msql_file": "alter_function_comment.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for alter.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function rename.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#" - }, - "expected_sql_file": "alter_function_rename.sql", - "expected_msql_file": "alter_function_rename.msql" - }, - { - "type": "alter", - "name": "Alter function code and add parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "prosrc": "begin\nselect '2';\nend\n", - "variables": { - "added": [ - { - "name": "application_name", - "value": "appname" - } - ] - } - }, - "expected_sql_file": "alter_function_add_parameter.sql", - "expected_msql_file": "alter_function_add_parameter.msql" - }, - { - "type": "alter", - "name": "Alter function delete parameters.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "variables": { - "deleted": [ - { - "name": "application_name", - "value": true - } - ] - } - }, - "expected_sql_file": "alter_function_delete_parameter.sql", - "expected_msql_file": "alter_function_delete_parameter.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create function for acl.", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "name": "Function2_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "character varying", - "lanname": "plpgsql", - "provolatile": "v", - "proparallel": "u", - "prosecdef": true, - "arguments": [], - "procost": "100", - "prosrc": "begin\nselect '1';\nend", - "probin": "$libdir/", - "options": [], - "variables": [ - { - "name": "enable_sort", - "value": true - } - ], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_for_alter.sql", - "expected_msql_file": "create_function_for_alter.msql" - }, - { - "type": "alter", - "name": "Alter function add acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_add_acl.sql", - "expected_msql_file": "alter_function_add_acl.msql" - }, - { - "type": "alter", - "name": "Alter function remove partial privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_func_remove_partial_pri.sql", - "expected_msql_file": "alter_func_remove_partial_pri.msql" - }, - { - "type": "alter", - "name": "Alter function change grantee in privileges.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_change_grantee_acl.sql", - "expected_msql_file": "alter_function_change_grantee_acl.msql" - }, - { - "type": "alter", - "name": "Alter function delete acl.", - "endpoint": "NODE-function.obj_id", - "msql_endpoint": "NODE-function.msql_id", - "sql_endpoint": "NODE-function.sql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "X", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_function_delete_acl.sql", - "expected_msql_file": "alter_function_delete_acl.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function (atomic).", - "store_object_id": "True", - "data": { - "name": "Function4_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "numeric", - "lanname": "sql", - "prorows": 0, - "arguments": [], - "prosrc": "begin atomic\n select 1;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "prosecdef":true, - "acl": [], - "provolatile":"v", - "proisstrict":true, - "proiswindow":true, - "proparallel":"u", - "procost":"100", - "proleakproof":true, - "schema": "public" - }, - "expected_sql_file": "create_atomic_func.sql", - "expected_msql_file": "create_atomic_func.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - }, - { - "type": "create", - "endpoint": "NODE-function.obj", - "msql_endpoint": "NODE-function.msql", - "sql_endpoint": "NODE-function.sql_id", - "name": "Create function with custom return type.", - "data": { - "name": "Function3_$%{}[]()&*^!@\"'`\\/#", - "funcowner": "enterprisedb", - "pronamespace": 2200, - "prorettypename": "table(val character varying)", - "lanname": "plpgsql", - "provolatile": "v", - "proretset": false, - "proisstrict": true, - "prosecdef": true, - "proiswindow": true, - "proparallel": "u", - "procost": "100", - "prorows": "0", - "proleakproof": true, - "arguments": [ - { - "argtype": "character varying", - "argmode": "IN", - "argname": "param", - "argdefval": "'1'" - } - ], - "prosrc": "begin\n return query select '1'::character varying;\nend", - "probin": "$libdir/", - "options": [], - "variables": [], - "seclabels": [], - "acl": [], - "schema": "public" - }, - "expected_sql_file": "create_function_with_custom_return.sql", - "expected_msql_file": "create_function_with_custom_return.msql" - }, - { - "type": "delete", - "name": "Drop function", - "endpoint": "NODE-function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_procedures.json deleted file mode 100644 index e65f8d6f513..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_procedures.json +++ /dev/null @@ -1,261 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create procedure with extensions.", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/", - "dependsonextensions": ["plpgsql", "postgres_fdw"] - }, - "expected_sql_file": "create_procedure_on_depends.sql", - "expected_msql_file": "create_procedure_on_depends.msql" - }, - { - "type": "alter", - "name": "Alter procedure with NO DEPENDS ON", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "dependsonextensions": ["plpgsql"] - }, - "expected_sql_file": "alter_proc_no_depends.sql", - "expected_msql_file": "alter_proc_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": { - } - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [""] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create procedure", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public", - "provolatile": null, - "proisstrict": false, - "proparallel": null, - "procost": null, - "proleakproof": false, - "probin": "$libdir/" - }, - "expected_sql_file": "create_procedure.sql", - "expected_msql_file": "create_procedure.msql" - }, - { - "type": "alter", - "name": "Alter procedure comment", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_proc_comment.sql", - "expected_msql_file": "alter_proc_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure param", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "variables": { - "added": [{"name": "application_name", "value": "pgadmin"}] - } - }, - "expected_sql_file": "alter_proc_param.sql", - "expected_msql_file": "alter_proc_param_msql.sql" - }, - { - "type": "alter", - "name": "Alter procedure add privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - }, - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_add_priv.sql", - "expected_msql_file": "alter_proc_add_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure delete privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_delete_priv.sql", - "expected_msql_file": "alter_proc_delete_priv.msql" - }, - { - "type": "alter", - "name": "Alter procedure change privileges", - "endpoint": "NODE-procedure.obj_id", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql_id", - "data": { - "acl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_proc_change_grantee_priv.sql", - "expected_msql_file": "alter_proc_change_grantee_priv.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": { - } - }, - { - "type": "create", - "name": "Create procedure (atomic)", - "endpoint": "NODE-procedure.obj", - "sql_endpoint": "NODE-procedure.sql_id", - "msql_endpoint": "NODE-procedure.msql", - "data": { - "name":"Proc3_$%{}[]()&*^!@\"'`\\/#", - "funcowner":"enterprisedb", - "pronamespace":2200, - "description":"demo comments", - "lanname":"sql", - "provolatile":null, - "proisstrict":false, - "proparallel":null, - "procost":null, - "prorows":0, - "proleakproof":false, - "arguments":[], - "prosrc":"begin atomic\nselect 1;\nend", - "probin":"$libdir/", - "options":[], - "seclabels":[], - "acl":[], - "schema": "public", - "variables":[{"name":"application_name","value":"demo"}] - }, - "expected_sql_file": "create_atomic_proc.sql", - "expected_msql_file": "create_atomic_proc.msql" - }, - { - "type": "delete", - "name": "Drop procedure", - "endpoint": "NODE-procedure.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_trigger_functions.json deleted file mode 100644 index 3f20cf80116..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/test_trigger_functions.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger.sql" - }, { - "type": "alter", - "name": "Alter trigger function comment", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "description": "some comment" - }, - "expected_sql_file": "alter_ptrig_comment.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 1 - Strict, Leakproof, Security of definer, Volatility", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "proisstrict": true, - "proleakproof": true, - "prosecdef": true, - "provolatile": "s" - }, - "expected_sql_file": "alter_ptrig_set_1.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 2 - Cost, Volatility, Add Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "procost": "123", - "provolatile": "i", - "variables": { - "added": [{ - "name": "application_name", - "value": "appname" - },{ - "name": "search_path", - "value": "public, pg_temp" - }] - } - }, - "expected_sql_file": "alter_ptrig_set_2.sql" - }, { - "type": "alter", - "name": "Alter trigger function Set 3 - Add Param, Change Param", - "endpoint": "NODE-trigger_function.obj_id", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "variables": { - "added": [{ - "name": "application_name", - "value": "appname2" - }], - "changed": [{ - "name": "array_nulls", - "value": true - },{ - "name": "search_path", - "value": "public, pg_catalog" - }] - } - }, - "expected_sql_file": "alter_ptrig_set_3.sql" - }, { - "type": "delete", - "name": "Drop trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - }, { - "type": "create", - "name": "Create full fledged trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [{ - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - }], - "args": [], - "description": "some comment", - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [{ - "name": "application_name", - "value": "appname" - },{ - "name": "search_path", - "value": "public, pg_temp" - }], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_full.sql" - }, { - "type": "delete", - "name": "Drop full fledged trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - }, { - "type": "create", - "name": "Create full fledged event trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [{ - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege": true, - "privilege_type": "X", - "with_grant": true - } - ] - }], - "args": [], - "description": "some comment", - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "procost": "1234", - "proisstrict": true, - "proiswindow": true, - "proleakproof": true, - "pronamespace": 2200, - "proretset": true, - "prorettypename": "event_trigger", - "prorows": "4321", - "prosecdef": true, - "provolatile": "v", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [{ - "name": "application_name", - "value": "appname" - }], - "schema": "public" - }, - "expected_sql_file": "create_event_trigger_full.sql" - }, { - "type": "delete", - "name": "Drop full fledged event trigger function", - "endpoint": "NODE-trigger_function.delete_id", - "data": { - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_func_remove_partial_pri.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_func_remove_partial_pri.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_func_remove_partial_pri.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_func_remove_partial_pri.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_func_remove_partial_pri.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_func_remove_partial_pri.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_func_remove_partial_pri.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_func_remove_partial_pri.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_add_parameter.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_add_parameter.msql index 900e3a9cd03..0b48852ba37 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_add_parameter.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_add_parameter.msql @@ -2,12 +2,13 @@ CREATE OR REPLACE FUNCTION public."Function3_$%{}[]()&*^!@""'`\/#"() RETURNS character varying LANGUAGE 'plpgsql' VOLATILE SECURITY DEFINER - + PARALLEL UNSAFE COST 100 + SET application_name='appname' SET enable_sort='true' AS $BODY$ begin select '2'; end -$BODY$; +$BODY$; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_function_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_function_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_function_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/alter_function_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_function_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_add_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_add_priv.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/12_plus/alter_proc_add_priv.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_add_priv.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_add_priv.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_add_priv.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_add_priv.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.msql index 5577b14cc47..be3dbd0a66a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.msql @@ -1,13 +1,3 @@ -CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(IN i1 integer) - LANGUAGE 'plpgsql' - - SET application_name='pgadmin' -AS $BODY$ -begin -select 1; -end; -$BODY$; - REVOKE ALL ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) FROM enterprisedb; -GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; +GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.sql index dbcc4638831..658111d4aaf 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_change_grantee_priv.sql @@ -3,7 +3,7 @@ -- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) + IN i1 integer) LANGUAGE 'plpgsql' SET application_name='pgadmin' AS $BODY$ @@ -11,8 +11,7 @@ begin select 1; end; $BODY$; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#" +ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) OWNER TO enterprisedb; GRANT EXECUTE ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment.sql index 241e38d3f44..61485c88215 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment.sql @@ -3,15 +3,15 @@ -- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - COST 100 -AS begin + IN i1 integer) +LANGUAGE 'plpgsql' +AS $BODY$ +begin select 1; end; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#" +$BODY$; +ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) OWNER TO enterprisedb; -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#" +COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment_msql.sql index 616d2d22586..d48fca1bfbe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_comment_msql.sql @@ -1,2 +1,2 @@ -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`/#" +COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_delete_priv.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_delete_priv.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_delete_priv.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_delete_priv.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_delete_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_delete_priv.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_delete_priv.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_delete_priv.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/14_plus/alter_proc_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/alter_proc_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param.sql index 40ddcd3f468..5d7491f4188 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param.sql @@ -3,16 +3,16 @@ -- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - COST 100 + IN i1 integer) +LANGUAGE 'plpgsql' SET application_name='pgadmin' -AS begin +AS $BODY$ +begin select 1; end; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#" +$BODY$; +ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) OWNER TO enterprisedb; -COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#" +COMMENT ON PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param_msql.sql index 900c68ed49d..52c0f9c51c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_proc_param_msql.sql @@ -1,2 +1,2 @@ -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`/#" +ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) SET application_name=pgadmin; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_func.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_func.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_func.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_func.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_func.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_func.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_func.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_func.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_proc.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_proc.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_proc.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_proc.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_proc.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_proc.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_atomic_proc.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_atomic_proc.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql index 4950ef5a618..f10c8cc5f60 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql @@ -18,5 +18,9 @@ $BODY$; ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() OWNER TO enterprisedb; +GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO enterprisedb WITH GRANT OPTION; + +REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; + COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_function_on_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_function_on_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_function_on_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_function_on_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_function_on_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_function_on_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/13_plus/create_function_on_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_function_on_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql index d1bcf8b0e4f..b47c38bd7d9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql @@ -6,7 +6,7 @@ CREATE OR REPLACE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() RETURNS SETOF trigger LANGUAGE 'plpgsql' COST 1234 - STABLE LEAKPROOF STRICT SECURITY DEFINER WINDOW + VOLATILE LEAKPROOF STRICT SECURITY DEFINER WINDOW ROWS 4321 SET application_name='appname' SET search_path=public, pg_temp @@ -19,5 +19,9 @@ $BODY$; ALTER FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() OWNER TO enterprisedb; +GRANT EXECUTE ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() TO enterprisedb WITH GRANT OPTION; + +REVOKE ALL ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() FROM PUBLIC; + COMMENT ON FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"() IS 'some comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure.sql index b377916ad1d..bce3f5e11a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure.sql @@ -3,12 +3,12 @@ -- DROP PROCEDURE IF EXISTS public."Proc1_$%{}[]()&*^!@""'`\/#"(integer); CREATE OR REPLACE PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"( - i1 integer) - VOLATILE SECURITY DEFINER PARALLEL UNSAFE - COST 100 -AS begin + IN i1 integer) +LANGUAGE 'plpgsql' +AS $BODY$ +begin select 1; end; - -ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#" +$BODY$; +ALTER PROCEDURE public."Proc1_$%{}[]()&*^!@""'`\/#"(integer) OWNER TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure_on_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure_on_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure_on_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure_on_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure_on_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure_on_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/14_plus/create_procedure_on_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_procedure_on_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_function.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_function.json index 25f346a0444..03ac4022308 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_function.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_function.json @@ -1,5 +1,91 @@ { "scenarios": [ + { + "type": "create", + "name": "Create Extension", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "postgres_fdw", + "version": "", + "relocatable": true + }, + "store_object_id": true + }, + { + "type": "create", + "name": "Create function with extensions.", + "endpoint": "NODE-function.obj", + "msql_endpoint": "NODE-function.msql", + "sql_endpoint": "NODE-function.sql_id", + "data": { + "name": "Function1_$%{}[]()&*^!@\"'`\\/#", + "funcowner": "enterprisedb", + "pronamespace": 2200, + "prorettypename": "character varying", + "lanname": "plpgsql", + "provolatile": "v", + "proretset": false, + "proisstrict": true, + "prosecdef": true, + "proiswindow": true, + "proparallel": "u", + "procost": "100", + "prorows": "0", + "proleakproof": true, + "arguments": [ + { + "argtype": "character varying", + "argmode": "IN", + "argname": "param", + "argdefval": "'1'" + } + ], + "prosrc": "begin\nselect '1';\nend", + "probin": "$libdir/", + "options": [], + "variables": [ + { + "name": "enable_sort", + "value": true + } + ], + "seclabels": [], + "acl": [], + "dependsonextensions": ["plpgsql", "postgres_fdw"], + "schema": "public" + }, + "expected_sql_file": "create_function_on_depends.sql", + "expected_msql_file": "create_function_on_depends.msql" + }, + { + "type": "alter", + "name": "Alter function with NO DEPENDS ON", + "endpoint": "NODE-function.obj_id", + "msql_endpoint": "NODE-function.msql_id", + "sql_endpoint": "NODE-function.sql_id", + "data": { + "dependsonextensions": ["plpgsql"] + }, + "expected_sql_file": "alter_function_no_depends.sql", + "expected_msql_file": "alter_function_no_depends.msql" + }, + { + "type": "delete", + "name": "Drop function", + "endpoint": "NODE-function.delete_id", + "data": { + } + }, + { + "type": "delete", + "name": "Drop Extension", + "endpoint": "NODE-extension.delete", + "data": { + "ids": [""] + }, + "preprocess_data": true + }, { "type": "create", "name": "Create function with all options.", @@ -126,7 +212,8 @@ ] } }, - "expected_sql_file": "alter_function_add_parameter.sql" + "expected_sql_file": "alter_function_add_parameter.sql", + "expected_msql_file": "alter_function_add_parameter.msql" }, { "type": "alter", @@ -246,7 +333,9 @@ } ] } - } + }, + "expected_sql_file": "alter_func_remove_partial_pri.sql", + "expected_msql_file": "alter_func_remove_partial_pri.msql" }, { "type": "alter", @@ -319,6 +408,46 @@ "data": { } }, + { + "type": "create", + "endpoint": "NODE-function.obj", + "msql_endpoint": "NODE-function.msql", + "sql_endpoint": "NODE-function.sql_id", + "name": "Create function (atomic).", + "store_object_id": "True", + "data": { + "name": "Function4_$%{}[]()&*^!@\"'`\\/#", + "funcowner": "enterprisedb", + "pronamespace": 2200, + "prorettypename": "numeric", + "lanname": "sql", + "prorows": 0, + "arguments": [], + "prosrc": "begin atomic\n select 1;\nend", + "probin": "$libdir/", + "options": [], + "variables": [], + "seclabels": [], + "prosecdef":true, + "acl": [], + "provolatile":"v", + "proisstrict":true, + "proiswindow":true, + "proparallel":"u", + "procost":"100", + "proleakproof":true, + "schema": "public" + }, + "expected_sql_file": "create_atomic_func.sql", + "expected_msql_file": "create_atomic_func.msql" + }, + { + "type": "delete", + "name": "Drop function", + "endpoint": "NODE-function.delete_id", + "data": { + } + }, { "type": "create", "endpoint": "NODE-function.obj", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_procedures.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_procedures.json index b51bc23faea..e65f8d6f513 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_procedures.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_procedures.json @@ -1,21 +1,84 @@ { "scenarios": [ + { + "type": "create", + "name": "Create Extension", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "postgres_fdw", + "version": "", + "relocatable": true + }, + "store_object_id": true + }, + { + "type": "create", + "name": "Create procedure with extensions.", + "endpoint": "NODE-procedure.obj", + "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql", + "data": { + "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", + "acl": [], + "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], + "funcowner": "enterprisedb", + "lanname": "plpgsql", + "options": [], + "pronamespace": 2200, + "prosrc": "begin\nselect 1;\nend;", + "seclabels": [], + "variables": [], + "schema": "public", + "provolatile": null, + "proisstrict": false, + "proparallel": null, + "procost": null, + "proleakproof": false, + "probin": "$libdir/", + "dependsonextensions": ["plpgsql", "postgres_fdw"] + }, + "expected_sql_file": "create_procedure_on_depends.sql", + "expected_msql_file": "create_procedure_on_depends.msql" + }, + { + "type": "alter", + "name": "Alter procedure with NO DEPENDS ON", + "endpoint": "NODE-procedure.obj_id", + "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql_id", + "data": { + "dependsonextensions": ["plpgsql"] + }, + "expected_sql_file": "alter_proc_no_depends.sql", + "expected_msql_file": "alter_proc_no_depends.msql" + }, + { + "type": "delete", + "name": "Drop procedure", + "endpoint": "NODE-procedure.delete_id", + "data": { + } + }, + { + "type": "delete", + "name": "Drop Extension", + "endpoint": "NODE-extension.delete", + "data": { + "ids": [""] + }, + "preprocess_data": true + }, { "type": "create", "name": "Create procedure", "endpoint": "NODE-procedure.obj", "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql", "data": { "name": "Proc1_$%{}[]()&*^!@\"'`\\/#", "acl": [], - "arguments": [ - { - "argtype": "integer", - "argmode": "IN", - "argname": "i1", - "argdefval": "" - } - ], + "arguments": [{"argtype": "integer", "argmode": "IN", "argname": "i1", "argdefval": ""}], "funcowner": "enterprisedb", "lanname": "plpgsql", "options": [], @@ -31,13 +94,15 @@ "proleakproof": false, "probin": "$libdir/" }, - "expected_sql_file": "create_procedure.sql" + "expected_sql_file": "create_procedure.sql", + "expected_msql_file": "create_procedure.msql" }, { "type": "alter", "name": "Alter procedure comment", "endpoint": "NODE-procedure.obj_id", "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql_id", "data": { "description": "some comment" }, @@ -48,16 +113,11 @@ "type": "alter", "name": "Alter procedure param", "endpoint": "NODE-procedure.obj_id", - "provolatile": "s", "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql_id", "data": { "variables": { - "added": [ - { - "name": "application_name", - "value": "pgadmin" - } - ] + "added": [{"name": "application_name", "value": "pgadmin"}] } }, "expected_sql_file": "alter_proc_param.sql", @@ -65,26 +125,50 @@ }, { "type": "alter", - "name": "Alter procedure options", + "name": "Alter procedure add privileges", "endpoint": "NODE-procedure.obj_id", "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql_id", "data": { - "provolatile": "s", - "proparallel": "r", - "description": "some comment", - "procost": "120" + "acl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege": true, + "privilege_type": "X", + "with_grant": false + } + ] + }, + { + "grantee": "enterprisedb", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege": true, + "privilege_type": "X", + "with_grant": false + } + ] + } + ] + } }, - "expected_sql_file": "alter_proc_opt.sql", - "expected_msql_file": "alter_proc_opt_msql.sql" + "expected_sql_file": "alter_proc_add_priv.sql", + "expected_msql_file": "alter_proc_add_priv.msql" }, { "type": "alter", - "name": "Alter procedure add privileges", + "name": "Alter procedure delete privileges", "endpoint": "NODE-procedure.obj_id", "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql_id", "data": { "acl": { - "added": [ + "deleted": [ { "grantee": "PUBLIC", "grantor": "enterprisedb", @@ -95,10 +179,26 @@ "with_grant": false } ] - }, + } + ] + } + }, + "expected_sql_file": "alter_proc_delete_priv.sql", + "expected_msql_file": "alter_proc_delete_priv.msql" + }, + { + "type": "alter", + "name": "Alter procedure change privileges", + "endpoint": "NODE-procedure.obj_id", + "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql_id", + "data": { + "acl": { + "changed": [ { - "grantee": "enterprisedb", + "grantee": "PUBLIC", "grantor": "enterprisedb", + "old_grantee": "enterprisedb", "privileges": [ { "privilege": true, @@ -109,8 +209,47 @@ } ] } + }, + "expected_sql_file": "alter_proc_change_grantee_priv.sql", + "expected_msql_file": "alter_proc_change_grantee_priv.msql" + }, + { + "type": "delete", + "name": "Drop procedure", + "endpoint": "NODE-procedure.delete_id", + "data": { } }, + { + "type": "create", + "name": "Create procedure (atomic)", + "endpoint": "NODE-procedure.obj", + "sql_endpoint": "NODE-procedure.sql_id", + "msql_endpoint": "NODE-procedure.msql", + "data": { + "name":"Proc3_$%{}[]()&*^!@\"'`\\/#", + "funcowner":"enterprisedb", + "pronamespace":2200, + "description":"demo comments", + "lanname":"sql", + "provolatile":null, + "proisstrict":false, + "proparallel":null, + "procost":null, + "prorows":0, + "proleakproof":false, + "arguments":[], + "prosrc":"begin atomic\nselect 1;\nend", + "probin":"$libdir/", + "options":[], + "seclabels":[], + "acl":[], + "schema": "public", + "variables":[{"name":"application_name","value":"demo"}] + }, + "expected_sql_file": "create_atomic_proc.sql", + "expected_msql_file": "create_atomic_proc.msql" + }, { "type": "delete", "name": "Drop procedure", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_trigger_functions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_trigger_functions.json index 96e2fc38259..3f20cf80116 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_trigger_functions.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/test_trigger_functions.json @@ -67,16 +67,16 @@ "sql_endpoint": "NODE-trigger_function.sql_id", "data": { "variables": { - "changed": [{ + "added": [{ "name": "application_name", "value": "appname2" - },{ - "name": "search_path", - "value": "public, pg_catalog" }], - "added": [{ + "changed": [{ "name": "array_nulls", "value": true + },{ + "name": "search_path", + "value": "public, pg_catalog" }] } }, @@ -94,7 +94,17 @@ "sql_endpoint": "NODE-trigger_function.sql_id", "data": { "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], + "acl": [{ + "grantee": "enterprisedb", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege": true, + "privilege_type": "X", + "with_grant": true + } + ] + }], "args": [], "description": "some comment", "funcowner": "enterprisedb", @@ -109,7 +119,7 @@ "prorettypename": "trigger", "prorows": "4321", "prosecdef": true, - "provolatile": "s", + "provolatile": "v", "prosrc": "begin\nselect 1;\nend;", "seclabels": [], "variables": [{ @@ -135,7 +145,17 @@ "sql_endpoint": "NODE-trigger_function.sql_id", "data": { "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], + "acl": [{ + "grantee": "enterprisedb", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege": true, + "privilege_type": "X", + "with_grant": true + } + ] + }], "args": [], "description": "some comment", "funcowner": "enterprisedb", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/11_plus/create.sql deleted file mode 100644 index c15382ce51b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/11_plus/create.sql +++ /dev/null @@ -1,13 +0,0 @@ -{% if data %} -CREATE OPERATOR {{data.schema}}.{{data.name}} ( - FUNCTION = {{data.operproc}}{% if data.lefttype %}, - LEFTARG = {{data.lefttype}}{% endif %}{% if data.righttype %}, - RIGHTARG = {{data.righttype}}{% endif %}{% if data.commutator %}, - COMMUTATOR = {{data.commutator}}{% endif %}{% if data.negator %}, - NEGATOR = {{data.negator}}{% endif %}{% if data.restrproc %}, - RESTRICT = {{data.restrproc}}{% endif %}{% if data.joinproc %}, - JOIN = {{data.joinproc}}{% endif %}{% if data.support_hash %}, - HASHES{% endif %}{% if data.support_merge %}, MERGES{% endif %} - -); -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/default/create.sql index 6c31580741b..c15382ce51b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/templates/operators/sql/default/create.sql @@ -1,6 +1,6 @@ {% if data %} CREATE OPERATOR {{data.schema}}.{{data.name}} ( - PROCEDURE = {{data.operproc}}{% if data.lefttype %}, + FUNCTION = {{data.operproc}}{% if data.lefttype %}, LEFTARG = {{data.lefttype}}{% endif %}{% if data.righttype %}, RIGHTARG = {{data.righttype}}{% endif %}{% if data.commutator %}, COMMUTATOR = {{data.commutator}}{% endif %}{% if data.negator %}, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/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 deleted file mode 100644 index fdf0fce5b00..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/get_oid.sql +++ /dev/null @@ -1,17 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind IN ('f', 'w') - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/properties.sql deleted file mode 100644 index 78572e40cfd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/properties.sql +++ /dev/null @@ -1,27 +0,0 @@ -SELECT pg_proc.oid, - proname AS name, - pronargs, - proallargtypes, - proargnames AS argnames, - pronargdefaults, - pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - proargdeclaredmodes AS proargmodes, - proargnames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pg_catalog.pg_get_userbyid(proowner) AS funcowner, - pg_catalog.pg_get_function_result(pg_proc.oid) AS prorettypename, - prosrc, - lanname, - CASE - WHEN proaccess = '+' THEN 'Public' - WHEN proaccess = '-' THEN 'Private' - ELSE 'Unknown' END AS visibility -FROM pg_catalog.pg_proc, pg_catalog.pg_namespace, pg_catalog.pg_language lng -WHERE prokind IN ('f', 'w') -AND pronamespace = {{pkgid}}::oid -AND pg_proc.pronamespace = pg_namespace.oid -AND lng.oid=prolang -{% if edbfnid %} -AND pg_proc.oid = {{edbfnid}}::oid -{% endif %} - ORDER BY name diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_oid.sql index e63cda3fd99..fdf0fce5b00 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_oid.sql @@ -12,6 +12,6 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind IN ('f', 'w') AND typname NOT IN ('trigger', 'event_trigger') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/properties.sql index 250115238ae..78572e40cfd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/properties.sql @@ -17,7 +17,7 @@ SELECT pg_proc.oid, WHEN proaccess = '-' THEN 'Private' ELSE 'Unknown' END AS visibility FROM pg_catalog.pg_proc, pg_catalog.pg_namespace, pg_catalog.pg_language lng -WHERE protype = '0'::char +WHERE prokind IN ('f', 'w') AND pronamespace = {{pkgid}}::oid AND pg_proc.pronamespace = pg_namespace.oid AND lng.oid=prolang diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/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 deleted file mode 100644 index c4a2cca4a17..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/get_oid.sql +++ /dev/null @@ -1,17 +0,0 @@ -SELECT - pr.oid, pr.proname || '(' || COALESCE(pg_catalog - .pg_get_function_identity_arguments(pr.oid), '') || ')' as name, - lanname, pg_catalog.pg_get_userbyid(proowner) as funcowner -FROM - pg_catalog.pg_proc pr -JOIN - pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN - pg_catalog.pg_language lng ON lng.oid=prolang -JOIN - pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace - AND nsp.nspname={{ nspname|qtLiteral(conn) }} -WHERE - pr.prokind = 'p' - AND typname NOT IN ('trigger', 'event_trigger') - AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/properties.sql deleted file mode 100644 index 5f25b0af1e2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/properties.sql +++ /dev/null @@ -1,27 +0,0 @@ -SELECT pg_proc.oid, - proname AS name, - pronargs, - proallargtypes, - proargnames AS argnames, - pronargdefaults, - pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - proargdeclaredmodes AS proargmodes, - proargnames, - pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, - pg_catalog.pg_get_userbyid(proowner) AS funcowner, - pg_catalog.pg_get_function_result(pg_proc.oid) AS prorettypename, - prosrc, - lanname, - CASE - WHEN proaccess = '+' THEN 'Public' - WHEN proaccess = '-' THEN 'Private' - ELSE 'Unknown' END AS visibility -FROM pg_catalog.pg_proc, pg_catalog.pg_namespace, pg_catalog.pg_language lng -WHERE prokind = 'p' -AND pronamespace = {{pkgid}}::oid -AND pg_proc.pronamespace = pg_namespace.oid -AND lng.oid=prolang -{% if edbfnid %} -AND pg_proc.oid = {{edbfnid}}::oid -{% endif %} - ORDER BY name diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_oid.sql index e63cda3fd99..c4a2cca4a17 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_oid.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_oid.sql @@ -12,6 +12,6 @@ JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace AND nsp.nspname={{ nspname|qtLiteral(conn) }} WHERE - proisagg = FALSE + pr.prokind = 'p' AND typname NOT IN ('trigger', 'event_trigger') AND pr.proname = {{ name|qtLiteral(conn) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/properties.sql index 3e8f434b5fb..5f25b0af1e2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/properties.sql @@ -5,7 +5,7 @@ SELECT pg_proc.oid, proargnames AS argnames, pronargdefaults, pg_catalog.oidvectortypes(proargtypes) AS proargtypenames, - proargmodes, + proargdeclaredmodes AS proargmodes, proargnames, pg_catalog.pg_get_expr(proargdefaults, 'pg_catalog.pg_class'::regclass) AS proargdefaultvals, pg_catalog.pg_get_userbyid(proowner) AS funcowner, @@ -17,7 +17,7 @@ SELECT pg_proc.oid, WHEN proaccess = '-' THEN 'Private' ELSE 'Unknown' END AS visibility FROM pg_catalog.pg_proc, pg_catalog.pg_namespace, pg_catalog.pg_language lng -WHERE protype = '1'::char +WHERE prokind = 'p' AND pronamespace = {{pkgid}}::oid AND pg_proc.pronamespace = pg_namespace.oid AND lng.oid=prolang diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/count.sql deleted file mode 100644 index 7aa6fe79c30..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/count.sql +++ /dev/null @@ -1,6 +0,0 @@ -SELECT COUNT(*) -FROM - pg_catalog.pg_namespace nsp -WHERE nspparent = {{scid}}::oid -AND nspobjecttype = 0 -AND nspcompoundtrigger = false diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/nodes.sql deleted file mode 100644 index 0112d29eaa7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/12_plus/nodes.sql +++ /dev/null @@ -1,16 +0,0 @@ -SELECT - nsp.oid, nspname AS name, des.description -FROM - pg_catalog.pg_namespace nsp - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=nsp.oid AND des.classoid='pg_namespace'::regclass) -WHERE nspparent = {{scid}}::oid -{% if pkgid %} -AND nsp.oid = {{pkgid}}::oid -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = nsp.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} -AND nspobjecttype = 0 -AND nspcompoundtrigger = false -ORDER BY nspname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/count.sql index d82347a3bb3..7aa6fe79c30 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/count.sql @@ -2,4 +2,5 @@ SELECT COUNT(*) FROM pg_catalog.pg_namespace nsp WHERE nspparent = {{scid}}::oid -AND nspobjecttype = 0; +AND nspobjecttype = 0 +AND nspcompoundtrigger = false diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/nodes.sql index ead30b1a5d5..0112d29eaa7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/default/nodes.sql @@ -12,4 +12,5 @@ AND nsp.oid = {{pkgid}}::oid WHERE objid = nsp.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END {% endif %} AND nspobjecttype = 0 +AND nspcompoundtrigger = false ORDER BY nspname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment.sql deleted file mode 100644 index 516589aa6a2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Package: public.pkg_emp_$%{}[]()&*^!@"'`\/# - --- DROP PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"; - -CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" -IS -FUNCTION func1(v1 integer) RETURN integer; -PROCEDURE proc1(IN v1 integer); -END "pkg_emp_$%{}[]()&*^!@""'`\/#"; - -CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#" -IS -FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10; END FUNC1; -PROCEDURE proc1(IN v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; - -END "pkg_emp_$%{}[]()&*^!@""'`\/#"; - -GRANT EXECUTE ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" - IS 'test comment updated'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment_msql.sql deleted file mode 100644 index 00918abdd7d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/alter_package_headers_and_comment_msql.sql +++ /dev/null @@ -1,4 +0,0 @@ -REVOKE ALL ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" FROM enterprisedb; - -COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" - IS 'test comment updated'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options.sql deleted file mode 100644 index 5befe152e00..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Package: public.pkg_emp_$%{}[]()&*^!@"'`\/# - --- DROP PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#"; - -CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" -IS -FUNCTION func1(v1 integer) RETURN integer; -PROCEDURE proc1(IN v1 integer); -END "pkg_emp_$%{}[]()&*^!@""'`\/#"; - -CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#" -IS -FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10; END FUNC1; -PROCEDURE proc1(IN v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; - -END "pkg_emp_$%{}[]()&*^!@""'`\/#"; - -GRANT EXECUTE ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT EXECUTE ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" TO enterprisedb WITH GRANT OPTION; - -COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options_msql.sql deleted file mode 100644 index 1b04f99f8b6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/create_package_with_all_options_msql.sql +++ /dev/null @@ -1,17 +0,0 @@ -CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" -IS -FUNCTION func1(v1 integer) RETURN integer; -PROCEDURE proc1(v1 integer); -END "pkg_emp_$%{}[]()&*^!@""'`\/#"; - -CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#" -IS -FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10; END FUNC1; -PROCEDURE proc1(v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; - -END "pkg_emp_$%{}[]()&*^!@""'`\/#"; - -GRANT EXECUTE ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" TO enterprisedb WITH GRANT OPTION; - -COMMENT ON PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/test.json deleted file mode 100644 index 29344c76d5e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/14_plus/test.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Packages", - "endpoint": "NODE-package.obj", - "sql_endpoint": "NODE-package.sql_id", - "msql_endpoint": "NODE-package.msql", - "data": - { - "name": "pkg_emp_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "description": "test comment", - "pkgheadsrc": "FUNCTION func1(v1 integer) RETURN integer;\nPROCEDURE proc1(v1 integer);", - "pkgbodysrc": "FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10; END FUNC1;\nPROCEDURE proc1(v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END;", - "pkgacl": [{ - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [{ - "privilege_type": "X", - "privilege": true, - "with_grant": true - }] - }], - "schema": "public" - }, - "expected_sql_file": "create_package_with_all_options.sql", - "expected_msql_file": "create_package_with_all_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Packages", - "endpoint": "NODE-package.obj_id", - "sql_endpoint": "NODE-package.sql_id", - "msql_endpoint": "NODE-package.msql_id", - "data": - { - "description": "test comment updated", - "owner": "enterprisedb", - "pkgacl": { - "deleted": [{ - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [{ - "privilege_type": "X", - "privilege": true, - "with_grant": true - }] - }] - }, - "schema": "public" - }, - "expected_sql_file": "alter_package_headers_and_comment.sql", - "expected_msql_file": "alter_package_headers_and_comment_msql.sql" - }, - { - "type": "delete", - "name": "Drop Package", - "endpoint": "NODE-package.delete_id", - "data": { - "name": "pkg_emp_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/alter_package_headers_and_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/alter_package_headers_and_comment.sql index e0772c49878..516589aa6a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/alter_package_headers_and_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/alter_package_headers_and_comment.sql @@ -5,13 +5,13 @@ CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" IS FUNCTION func1(v1 integer) RETURN integer; -PROCEDURE proc1(v1 integer); +PROCEDURE proc1(IN v1 integer); END "pkg_emp_$%{}[]()&*^!@""'`\/#"; CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#" IS FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10; END FUNC1; -PROCEDURE proc1(v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; +PROCEDURE proc1(IN v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; END "pkg_emp_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/create_package_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/create_package_with_all_options.sql index 4f0e1074227..5befe152e00 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/create_package_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/tests/ppas/default/create_package_with_all_options.sql @@ -5,13 +5,13 @@ CREATE OR REPLACE PACKAGE public."pkg_emp_$%{}[]()&*^!@""'`\/#" IS FUNCTION func1(v1 integer) RETURN integer; -PROCEDURE proc1(v1 integer); +PROCEDURE proc1(IN v1 integer); END "pkg_emp_$%{}[]()&*^!@""'`\/#"; CREATE OR REPLACE PACKAGE BODY public."pkg_emp_$%{}[]()&*^!@""'`\/#" IS FUNCTION func1(v1 integer) RETURN integer IS BEGIN RETURN V1+10; END FUNC1; -PROCEDURE proc1(v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; +PROCEDURE proc1(IN v1 integer) IS BEGIN DBMS_OUTPUT.put_line(v1+50); END; END "pkg_emp_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.msql deleted file mode 100644 index 2d3cc204849..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.msql +++ /dev/null @@ -1,2 +0,0 @@ -REVOKE ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" FROM ; -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.sql deleted file mode 100644 index 71f37be005c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_alt_privilege.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.msql deleted file mode 100644 index b34f0e9fb10..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.msql +++ /dev/null @@ -1,15 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_2_$%{}[]()&*^!@""'`\/#" TO "new_col_2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" TYPE character COLLATE pg_catalog."C"; -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.sql deleted file mode 100644 index 6ac8f813c47..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_char.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; - -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.msql deleted file mode 100644 index 64cef6b0f2c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.sql deleted file mode 100644 index 52dab98e319..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.msql deleted file mode 100644 index 66e8d38309b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.sql deleted file mode 100644 index 0b4c8460684..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_drop_identity_by_default.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.msql deleted file mode 100644 index 776c9c2b6c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.msql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_3_$%{}[]()&*^!@""'`\/#" TO "new_col_3_$%{}[]()&*^!@""'`\/#"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.sql deleted file mode 100644 index 4c7c3dbcab2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.msql deleted file mode 100644 index 8e93d209b11..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.msql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_9_$%{}[]()&*^!@""'`\/#" TO "new_col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 2 SET MINVALUE 1 SET MAXVALUE 200 SET CACHE 2; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.sql deleted file mode 100644 index 77eec335834..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_by_default.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 2 START 1 MINVALUE 1 MAXVALUE 200 CACHE 2 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.msql deleted file mode 100644 index 11798454b01..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 3 RESTART SET START 3 SET MINVALUE 3 SET MAXVALUE 30 SET CACHE 3; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.sql deleted file mode 100644 index 16c198ec2ea..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_comb_start_seq.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 3 START 3 MINVALUE 3 MAXVALUE 30 CACHE 3 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.msql deleted file mode 100644 index 443b74cac36..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET GENERATED ALWAYS SET NO CYCLE RESTART SET START 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.sql deleted file mode 100644 index 1ca71a9072f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_identity_for_restart_seq.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 2 MINVALUE 1 MAXVALUE 10 CACHE 1 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.msql deleted file mode 100644 index b10ce502153..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_1_$%{}[]()&*^!@""'`\/#" TO "new_col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" TYPE real; -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.sql deleted file mode 100644 index c25fa41059c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_int.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.msql deleted file mode 100644 index fda949edfc9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_5_$%{}[]()&*^!@""'`\/#" TO "new_col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric(15, 6); -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.sql deleted file mode 100644 index 124be05e100..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_numeric.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric(15,6) NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); - -GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.msql deleted file mode 100644 index 625e9fbc924..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.sql deleted file mode 100644 index 55ec33a1b38..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_remove_length.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); - -GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.msql deleted file mode 100644 index 7922705798f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.msql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__1_$%{}[]()&*^!@""'`\/#" SET DEFAULT 'changed default value'; - -GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.sql deleted file mode 100644 index 0ce8ec23a8a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_text_with_default_value.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'changed default value'::text; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.msql deleted file mode 100644 index c256ac0b70b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.sql deleted file mode 100644 index 603ceb6cb23..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_char.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.msql deleted file mode 100644 index a9cc7a30ef7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.sql deleted file mode 100644 index 1319485df8a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_identity_for_restart_seq.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.msql deleted file mode 100644 index 41c4885a50b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.sql deleted file mode 100644 index af1c78edc4a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.msql deleted file mode 100644 index 3fa01ce4b41..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.sql deleted file mode 100644 index e8a43774660..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.msql deleted file mode 100644 index 339e0183a4f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.sql deleted file mode 100644 index f46ca745838..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_identity_by_default.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.msql deleted file mode 100644 index 5e365c07a40..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10, 5) NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.sql deleted file mode 100644 index f8a0076ecef..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_numeric.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10,5) NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/test.json deleted file mode 100644 index 50db016084e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/test.json +++ /dev/null @@ -1,882 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for testing column node (v.12+)", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "table_3_$%{}[]()&*^!@\"'`\\/#", - "is_partitioned": false, - "columns": [], - "schema": "testschema" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_int.sql", - "expected_msql_file": "create_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "cltype": "real", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_int.sql", - "expected_msql_file": "alter_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Privilege change)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "attacl": { - "changed": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_alt_privilege.sql", - "expected_msql_file": "alter_column_alt_privilege.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Character type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "character varying", - "collspcname": "pg_catalog.\"C\"", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "50", - "attprecision": "", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_char.sql", - "expected_msql_file": "create_column_char.msql" - }, - { - "type": "alter", - "name": "Alter Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 2, - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#", - "attlen": "", - "attstattarget": "5", - "attstorage": "p", - "description": "Comment for alter", - "cltype": "character", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_char.sql", - "expected_msql_file": "alter_column_char.msql" - }, - { - "type": "delete", - "name": "Drop Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "a", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity.sql", - "expected_msql_file": "create_column_int_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_identity.sql", - "expected_msql_file": "alter_column_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) drop identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity.sql", - "expected_msql_file": "alter_column_drop_identity.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "1 + 2 + 3", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated.sql", - "expected_msql_file": "create_column_int_generated.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 4, - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated.sql", - "expected_msql_file": "alter_column_generated.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_5_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "min_val": 0, - "max_val": 1000, - "cltype": "numeric", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "10", - "attprecision": "5", - "attidentity": "a", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_numeric.sql", - "expected_msql_file": "create_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", - "attnum": 5, - "attlen": "15", - "attprecision": "6", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_numeric.sql", - "expected_msql_file": "alter_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Remove Length)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "attlen": "" - }, - "expected_sql_file": "alter_column_remove_length.sql", - "expected_msql_file": "alter_column_remove_length.msql" - }, - { - "type": "delete", - "name": "Drop Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy1", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy2", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_8_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "dummy1 + dummy2", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated_with_existing_columns.sql", - "expected_msql_file": "create_column_int_generated_with_existing_columns.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 8, - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#", - "genexpr": "dummy1 - dummy2", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated_with_existing_columns.sql", - "expected_msql_file": "alter_column_generated_with_existing_columns.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (Generated by default)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity_by_default.sql", - "expected_msql_file": "create_column_int_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "seqincrement": "2", - "seqmax": "200", - "seqcache": "2", - "seqcycle": true, - "seqmin": "1" - }, - "expected_sql_file": "alter_column_identity_by_default.sql", - "expected_msql_file": "alter_column_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with drop identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity_by_default.sql", - "expected_msql_file": "alter_column_drop_identity_by_default.msql" - }, - { - "type": "delete", - "name": "Drop Column Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (BY DEFAULT) for combination of identity options & initiate START", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#", - "cltype": "bigint", - "attacl": [], - "description": "demo comments", - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "10", - "seqcache": "1", - "seqcycle": true, - "colconstype": "i", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_identity_for_restart_seq.sql", - "expected_msql_file": "create_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (BY DEFAULT) to ALWAYS & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnotnull": true, - "attidentity": "a", - "seqstart": 2, - "seqcycle": false - }, - "expected_sql_file": "alter_column_identity_for_restart_seq.sql", - "expected_msql_file": "alter_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (ALWAYS) for combination of identity options & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "attidentity": "a", - "seqincrement": "3", - "seqstart": "3", - "seqmin": "3", - "seqmax": "30", - "seqcache": "3", - "seqcycle": true - }, - "expected_sql_file": "alter_column_identity_for_comb_start_seq.sql", - "expected_msql_file": "alter_column_identity_for_comb_start_seq.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with text & default value", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#", - "cltype": "text", - "attacl": [], - "description": "test comment", - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [], - "defval": "'xyz'" - }, - "expected_sql_file": "create_column_text_with_default_value.sql", - "expected_msql_file": "create_column_text_with_default_value.msql" - }, - { - "type": "alter", - "name": "Alter Column with text & update default value", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#", - "defval": "'changed default value'", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_text_with_default_value.sql", - "expected_msql_file": "alter_column_text_with_default_value.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with time with time zone & default value using function", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#", - "cltype": "time with time zone", - "attacl": [], - "description": "test comment", - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": "4", - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [], - "defval": "now()" - }, - "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "alter", - "name": "Alter Column with time with time zone & update length", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#", - "attlen": "6", - "attnotnull": true, - "description": "test comment modification" - }, - "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with interger_array and options", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#", - "cltype": "integer[]", - "attacl": [], - "description": "comment", - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "n", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_with_interger_array_and_options.sql", - "expected_msql_file": "create_column_with_interger_array_and_options.msql" - }, - { - "type": "alter", - "name": "Alter Column with interger_array and options", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#", - "attoptions": { - "changed": [ - { - "name": "n_distinct", - "value": "2" - } - ] - } - }, - "expected_sql_file": "alter_column_with_interger_array_and_options.sql", - "expected_msql_file": "alter_column_with_interger_array_and_options.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/test.json deleted file mode 100644 index b974161b977..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/test.json +++ /dev/null @@ -1,926 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for testing column node (v.12+)", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "table_3_$%{}[]()&*^!@\"'`\\/#", - "is_partitioned": false, - "columns": [], - "schema": "testschema" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_int.sql", - "expected_msql_file": "create_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "cltype": "real", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_int.sql", - "expected_msql_file": "alter_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Privilege change)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "attacl": { - "changed": [ - { - "grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_alt_privilege.sql", - "expected_msql_file": "alter_column_alt_privilege.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Character type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "character varying", - "collspcname": "pg_catalog.\"C\"", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "50", - "attprecision": "", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_char.sql", - "expected_msql_file": "create_column_char.msql" - }, - { - "type": "alter", - "name": "Alter Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 2, - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#", - "attlen": "", - "attstattarget": "5", - "attstorage": "p", - "description": "Comment for alter", - "cltype": "character", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_char.sql", - "expected_msql_file": "alter_column_char.msql" - }, - { - "type": "delete", - "name": "Drop Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "a", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity.sql", - "expected_msql_file": "create_column_int_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_identity.sql", - "expected_msql_file": "alter_column_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) drop identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity.sql", - "expected_msql_file": "alter_column_drop_identity.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "1 + 2 + 3", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated.sql", - "expected_msql_file": "create_column_int_generated.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 4, - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated.sql", - "expected_msql_file": "alter_column_generated.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_5_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "min_val": 0, - "max_val": 1000, - "cltype": "numeric", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "10", - "attprecision": "5", - "attidentity": "a", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_numeric.sql", - "expected_msql_file": "create_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", - "attnum": 5, - "attlen": "15", - "attprecision": "6", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_numeric.sql", - "expected_msql_file": "alter_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Remove Length)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "attlen": "" - }, - "expected_sql_file": "alter_column_remove_length.sql", - "expected_msql_file": "alter_column_remove_length.msql" - }, - { - "type": "delete", - "name": "Drop Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy1", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy2", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_8_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "dummy1 + dummy2", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated_with_existing_columns.sql", - "expected_msql_file": "create_column_int_generated_with_existing_columns.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 8, - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#", - "genexpr": "dummy1 - dummy2", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated_with_existing_columns.sql", - "expected_msql_file": "alter_column_generated_with_existing_columns.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (Generated by default)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity_by_default.sql", - "expected_msql_file": "create_column_int_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "seqincrement": "2", - "seqmax": "200", - "seqcache": "2", - "seqcycle": true, - "seqmin": "1" - }, - "expected_sql_file": "alter_column_identity_by_default.sql", - "expected_msql_file": "alter_column_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with drop identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity_by_default.sql", - "expected_msql_file": "alter_column_drop_identity_by_default.msql" - }, - { - "type": "delete", - "name": "Drop Column Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (BY DEFAULT) for combination of identity options & initiate START", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#", - "cltype": "bigint", - "attacl": [], - "description": "demo comments", - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "10", - "seqcache": "1", - "seqcycle": true, - "colconstype": "i", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_identity_for_restart_seq.sql", - "expected_msql_file": "create_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (BY DEFAULT) to ALWAYS & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnotnull": true, - "attidentity": "a", - "seqstart": 2, - "seqcycle": false - }, - "expected_sql_file": "alter_column_identity_for_restart_seq.sql", - "expected_msql_file": "alter_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (ALWAYS) for combination of identity options & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "attidentity": "a", - "seqincrement": "3", - "seqstart": "3", - "seqmin": "3", - "seqmax": "30", - "seqcache": "3", - "seqcycle": true - }, - "expected_sql_file": "alter_column_identity_for_comb_start_seq.sql", - "expected_msql_file": "alter_column_identity_for_comb_start_seq.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with text & default value", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#", - "cltype": "text", - "attacl": [], - "description": "test comment", - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [], - "defval": "'xyz'" - }, - "expected_sql_file": "create_column_text_with_default_value.sql", - "expected_msql_file": "create_column_text_with_default_value.msql" - }, - { - "type": "alter", - "name": "Alter Column with text & update default value", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#", - "defval": "'changed default value'", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_text_with_default_value.sql", - "expected_msql_file": "alter_column_text_with_default_value.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with time with time zone & default value using function", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#", - "cltype": "time with time zone", - "attacl": [], - "description": "test comment", - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": "4", - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [], - "defval": "now()" - }, - "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "alter", - "name": "Alter Column with time with time zone & update length", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#", - "attlen": "6", - "attnotnull": true, - "description": "test comment modification" - }, - "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with interger_array and options", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#", - "cltype": "integer[]", - "attacl": [], - "description": "comment", - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "n", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_with_interger_array_and_options.sql", - "expected_msql_file": "create_column_with_interger_array_and_options.msql" - }, - { - "type": "alter", - "name": "Alter Column with interger_array and options", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#", - "attoptions": { - "changed": [ - { - "name": "n_distinct", - "value": "2" - } - ] - } - }, - "expected_sql_file": "alter_column_with_interger_array_and_options.sql", - "expected_msql_file": "alter_column_with_interger_array_and_options.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with compression", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", - "cltype": "character varying", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attcompression": "pglz", - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_comp.sql", - "expected_msql_file": "create_column_comp.msql" - }, - { - "type": "alter", - "name": "Alter Column compression type", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", - "attcompression": "lz4" - }, - "expected_sql_file": "alter_column_compression.sql", - "expected_msql_file": "alter_column_compression.msql" - }, - { - "type": "delete", - "name": "Drop Column with compression", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col_comp_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.msql index 766d8f688d6..2d3cc204849 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.msql @@ -1,2 +1,2 @@ -REVOKE ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" FROM ; -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO ; +REVOKE ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" FROM ; +GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.sql index cb6029d5598..71f37be005c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_alt_privilege.sql @@ -1,13 +1,13 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO ; +GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.msql index a5398f97efd..b34f0e9fb10 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.msql @@ -1,15 +1,15 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" RENAME "col_2_$%{}[]()&*^!@""'`\/#" TO "new_col_2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" TYPE character COLLATE pg_catalog."C"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.sql index e4b7935866f..6ac8f813c47 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_char.sql @@ -1,17 +1,17 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/alter_column_compression.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_compression.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/alter_column_compression.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_compression.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/alter_column_compression.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_compression.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/alter_column_compression.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_compression.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.msql index 245a8e68003..64cef6b0f2c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.sql index 581071b7432..52dab98e319 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.msql index b4a68709364..66e8d38309b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.sql index ae0b66011d2..0b4c8460684 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_drop_identity_by_default.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated_with_existing_columns.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated_with_existing_columns.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated_with_existing_columns.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated_with_existing_columns.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated_with_existing_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated_with_existing_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_generated_with_existing_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_generated_with_existing_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.msql index 3ccc61d2de9..776c9c2b6c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.msql @@ -1,7 +1,7 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" RENAME "col_3_$%{}[]()&*^!@""'`\/#" TO "new_col_3_$%{}[]()&*^!@""'`\/#"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.sql index 10eb60fdd8a..4c7c3dbcab2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.msql index 14008b508e1..8e93d209b11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.msql @@ -1,8 +1,8 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - RENAME "col_5_$%{}[]()&*^!@""'`\/#" TO "new_col_5_$%{}[]()&*^!@""'`\/#"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + RENAME "col_9_$%{}[]()&*^!@""'`\/#" TO "new_col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 2 SET MINVALUE 1 SET MAXVALUE 200 SET CACHE 2; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 2 SET MINVALUE 1 SET MAXVALUE 200 SET CACHE 2; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.sql index 8ba00535482..77eec335834 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_by_default.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 2 START 1 MINVALUE 1 MAXVALUE 200 CACHE 2 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 2 START 1 MINVALUE 1 MAXVALUE 200 CACHE 2 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.msql index f70ad836a01..11798454b01 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 3 RESTART SET START 3 SET MINVALUE 3 SET MAXVALUE 30 SET CACHE 3; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.sql index 43f66e22056..16c198ec2ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_comb_start_seq.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 3 START 3 MINVALUE 3 MAXVALUE 30 CACHE 3 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 3 START 3 MINVALUE 3 MAXVALUE 30 CACHE 3 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.msql index 2878a1d1b82..443b74cac36 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET GENERATED ALWAYS SET NO CYCLE RESTART SET START 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.sql index d0d693ab961..1ca71a9072f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_identity_for_restart_seq.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 2 MINVALUE 1 MAXVALUE 10 CACHE 1 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 2 MINVALUE 1 MAXVALUE 10 CACHE 1 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.msql index 31a650287e7..b10ce502153 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" RENAME "col_1_$%{}[]()&*^!@""'`\/#" TO "new_col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" TYPE real; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.sql index 207bc646f97..c25fa41059c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_int.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.msql index 8f400900f93..fda949edfc9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - RENAME "col_4_$%{}[]()&*^!@""'`\/#" TO "new_col_4_$%{}[]()&*^!@""'`\/#"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + RENAME "col_5_$%{}[]()&*^!@""'`\/#" TO "new_col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" TYPE numeric(15, 6); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric(15, 6); +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_4_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.sql index 45f6e03cff7..124be05e100 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_numeric.sql @@ -1,15 +1,15 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#" numeric(15,6) NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric(15,6) NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); -GRANT ALL("new_col_4_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.msql index d4caec80e2e..625e9fbc924 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.msql @@ -1,2 +1,2 @@ -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" TYPE numeric; \ No newline at end of file +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.sql index 96a9438dcdb..55ec33a1b38 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_remove_length.sql @@ -1,15 +1,15 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#" numeric NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); -GRANT ALL("new_col_4_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.msql index d2e6a589b10..7922705798f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.msql @@ -1,4 +1,4 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__1_$%{}[]()&*^!@""'`\/#" SET DEFAULT 'changed default value'; -GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.sql index 977ce3b0e93..0ce8ec23a8a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_text_with_default_value.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'changed default value'::text; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'changed default value'::text; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" IS 'test comment'; -GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.msql index 4f08f96b135..dac16cdedff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.msql @@ -1,7 +1,7 @@ -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__2_$%{}[]()&*^!@""'`\/#" TYPE time(6) with time zone ; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__2_$%{}[]()&*^!@""'`\/#" SET NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" IS 'test comment modification'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.sql index f5e8e3dcf24..382abf276e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_timestamp_with_default_value_using_function.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__2_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__2_$%{}[]()&*^!@""'`\/#" time(6) with time zone NOT NULL DEFAULT now(); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__2_$%{}[]()&*^!@""'`\/#" time(6) with time zone NOT NULL DEFAULT now(); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" IS 'test comment modification'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.msql index db179dad993..7205d0496fe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.msql @@ -1,3 +1,3 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" SET (n_distinct=2); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.sql index 4ffccc5644d..bd34ae1636a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/alter_column_with_interger_array_and_options.sql @@ -1,13 +1,13 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" IS 'comment'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" SET (n_distinct=2); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.msql index b07eb190e9b..c256ac0b70b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.sql index 51559b69ea0..603ceb6cb23 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_char.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_2_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/create_column_comp.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_comp.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/create_column_comp.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_comp.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/create_column_comp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_comp.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/14_plus/create_column_comp.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_comp.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.msql index 2d778d1c5e3..a9cc7a30ef7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.sql index 8f7c7a3a41e..1319485df8a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_identity_for_restart_seq.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.msql index ec7d70ac7c1..41c4885a50b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.sql index e62203d826a..af1c78edc4a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated_with_existing_columns.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated_with_existing_columns.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated_with_existing_columns.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated_with_existing_columns.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated_with_existing_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated_with_existing_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_int_generated_with_existing_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_generated_with_existing_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.msql index 37cc1d69a62..3fa01ce4b41 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.sql index d0374bdd3d9..e8a43774660 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.msql index 369cf079082..339e0183a4f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.sql index dcb9e56484f..f46ca745838 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_int_identity_by_default.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_5_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.msql index 08d2390d897..5e365c07a40 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_4_$%{}[]()&*^!@""'`\/#" numeric(10, 5) NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10, 5) NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.sql index f14a913566d..f8a0076ecef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_numeric.sql @@ -1,13 +1,13 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_4_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_4_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_4_$%{}[]()&*^!@""'`\/#" numeric(10,5) NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10,5) NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.msql index d4cb064b807..bb8d1d90484 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__1_$%{}[]()&*^!@""'`\/#" text DEFAULT 'xyz'; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text DEFAULT 'xyz'; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.sql index 9058d639f02..b53dfe9d489 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_text_with_default_value.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'xyz'::text; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'xyz'::text; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.msql index f989fba8919..dbb64a268d2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__2_$%{}[]()&*^!@""'`\/#" time(4) with time zone DEFAULT now(); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__2_$%{}[]()&*^!@""'`\/#" time(4) with time zone DEFAULT now(); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.sql index 184e6b287a5..1df229a186d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_timestamp_with_default_value_using_function.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__2_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__2_$%{}[]()&*^!@""'`\/#" time(4) with time zone DEFAULT now(); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__2_$%{}[]()&*^!@""'`\/#" time(4) with time zone DEFAULT now(); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.msql index ebe475d2b7e..8d302791e6f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" IS 'comment'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.sql index 3481f46f801..1f219905508 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/create_column_with_interger_array_and_options.sql @@ -1,13 +1,13 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" IS 'comment'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/test.json index a3f6d6b82ad..b974161b977 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/default/test.json @@ -2,11 +2,11 @@ "scenarios": [ { "type": "create", - "name": "Create Table for testing column node (v.10+)", + "name": "Create Table for testing column node (v.12+)", "endpoint": "NODE-table.obj", "sql_endpoint": "NODE-table.sql_id", "data": { - "name": "table_2_$%{}[]()&*^!@\"'`\\/#", + "name": "table_3_$%{}[]()&*^!@\"'`\\/#", "is_partitioned": false, "columns": [], "schema": "testschema" @@ -89,7 +89,6 @@ "data": { "attnum": 1, "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "cltype": "real", "attacl": { "changed": [ { @@ -154,7 +153,7 @@ "data": { "attnum": 2, "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#", - "attlen": null, + "attlen": "", "attstattarget": "5", "attstorage": "p", "description": "Comment for alter", @@ -289,13 +288,85 @@ }, { "type": "create", - "name": "Create Column (Numeric type with Length Precision & Variables)", + "name": "Create Column (Integer/Numeric type) with Generated feature", "endpoint": "NODE-column.obj", "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql", "data": { "name": "col_4_$%{}[]()&*^!@\"'`\\/#", "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": "", + "attprecision": "", + "attidentity": "a", + "colconstype": "g", + "genexpr": "1 + 2 + 3", + "attoptions": [], + "seclabels": [] + }, + "expected_sql_file": "create_column_int_generated.sql", + "expected_msql_file": "create_column_int_generated.msql" + }, + { + "type": "alter", + "name": "Alter Column (Integer/Numeric type) with Generated feature", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "attnum": 4, + "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", + "description": "Comment for alter", + "attacl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_column_generated.sql", + "expected_msql_file": "alter_column_generated.msql" + }, + { + "type": "delete", + "name": "Drop Column (Integer/Numeric type)", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Column (Numeric type with Length Precision & Variables)", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col_5_$%{}[]()&*^!@\"'`\\/#", + "description": "Comment for create", "min_val": 0, "max_val": 1000, "cltype": "numeric", @@ -323,8 +394,8 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql_id", "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", - "attnum": 4, + "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", + "attnum": 5, "attlen": "15", "attprecision": "6", "description": "Comment for alter", @@ -381,7 +452,120 @@ "endpoint": "NODE-column.obj_id", "sql_endpoint": "NODE-column.sql_id", "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" + "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Dummy Column (Integer/Numeric type)", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "dummy1", + "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attoptions": [], + "seclabels": [], + "defval": "1" + } + }, + { + "type": "create", + "name": "Create Dummy Column (Integer/Numeric type)", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "dummy2", + "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attoptions": [], + "seclabels": [], + "defval": "1" + } + }, + { + "type": "create", + "name": "Create Column (Integer/Numeric type) with Generated feature with columns", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col_8_$%{}[]()&*^!@\"'`\\/#", + "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": "", + "attprecision": "", + "attidentity": "a", + "colconstype": "g", + "genexpr": "dummy1 + dummy2", + "attoptions": [], + "seclabels": [] + }, + "expected_sql_file": "create_column_int_generated_with_existing_columns.sql", + "expected_msql_file": "create_column_int_generated_with_existing_columns.msql" + }, + { + "type": "alter", + "name": "Alter Column (Integer/Numeric type) with Generated feature with columns", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "attnum": 8, + "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#", + "genexpr": "dummy1 - dummy2", + "description": "Comment for alter", + "attacl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_column_generated_with_existing_columns.sql", + "expected_msql_file": "alter_column_generated_with_existing_columns.msql" + }, + { + "type": "delete", + "name": "Drop Column (Integer/Numeric type) with Generated feature with columns", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#" } }, { @@ -391,7 +575,7 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql", "data": { - "name": "col_5_$%{}[]()&*^!@\"'`\\/#", + "name": "col_9_$%{}[]()&*^!@\"'`\\/#", "description": "Comment for create", "cltype": "bigint", "attacl": [], @@ -420,8 +604,8 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql_id", "data": { - "attnum": 5, - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", + "attnum": 9, + "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#", "description": "Comment for alter", "seqincrement": "2", "seqmax": "200", @@ -439,7 +623,7 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql_id", "data": { - "attnum": 5, + "attnum": 9, "colconstype": "n" }, "expected_sql_file": "alter_column_drop_identity_by_default.sql", @@ -451,7 +635,7 @@ "endpoint": "NODE-column.obj_id", "sql_endpoint": "NODE-column.sql_id", "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" + "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#" } }, { @@ -467,8 +651,8 @@ "description": "demo comments", "is_primary_key": false, "attnotnull": true, - "attlen": "", - "attprecision": "", + "attlen": null, + "attprecision": null, "attidentity": "d", "seqincrement": "1", "seqstart": "1", @@ -693,6 +877,50 @@ "data": { "name": "col__3_$%{}[]()&*^!@\"'`\\/#" } + }, + { + "type": "create", + "name": "Create Column with compression", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", + "cltype": "character varying", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attcompression": "pglz", + "attoptions": [], + "seclabels": [], + "defval": "1" + }, + "expected_sql_file": "create_column_comp.sql", + "expected_msql_file": "create_column_comp.msql" + }, + { + "type": "alter", + "name": "Alter Column compression type", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", + "attcompression": "lz4" + }, + "expected_sql_file": "alter_column_compression.sql", + "expected_msql_file": "alter_column_compression.msql" + }, + { + "type": "delete", + "name": "Drop Column with compression", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "col_comp_$%{}[]()&*^!@\"'`\\/#" + } } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.msql deleted file mode 100644 index 09425ce5c1f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.msql +++ /dev/null @@ -1,2 +0,0 @@ -REVOKE ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" FROM enterprisedb; -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.sql deleted file mode 100644 index 75bc1ddf4c8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_alt_privilege.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.msql deleted file mode 100644 index b34f0e9fb10..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.msql +++ /dev/null @@ -1,15 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_2_$%{}[]()&*^!@""'`\/#" TO "new_col_2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" TYPE character COLLATE pg_catalog."C"; -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.sql deleted file mode 100644 index 6ac8f813c47..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_char.sql +++ /dev/null @@ -1,17 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; - -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.msql deleted file mode 100644 index 64cef6b0f2c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.sql deleted file mode 100644 index 52dab98e319..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.msql deleted file mode 100644 index 66e8d38309b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.sql deleted file mode 100644 index 0b4c8460684..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_drop_identity_by_default.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.msql deleted file mode 100644 index 776c9c2b6c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.msql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_3_$%{}[]()&*^!@""'`\/#" TO "new_col_3_$%{}[]()&*^!@""'`\/#"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.sql deleted file mode 100644 index 4c7c3dbcab2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.msql deleted file mode 100644 index 8e93d209b11..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.msql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_9_$%{}[]()&*^!@""'`\/#" TO "new_col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 2 SET MINVALUE 1 SET MAXVALUE 200 SET CACHE 2; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.sql deleted file mode 100644 index 77eec335834..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_by_default.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 2 START 1 MINVALUE 1 MAXVALUE 200 CACHE 2 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.msql deleted file mode 100644 index 11798454b01..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 3 RESTART SET START 3 SET MINVALUE 3 SET MAXVALUE 30 SET CACHE 3; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.sql deleted file mode 100644 index 16c198ec2ea..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_comb_start_seq.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 3 START 3 MINVALUE 3 MAXVALUE 30 CACHE 3 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.msql deleted file mode 100644 index 443b74cac36..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET GENERATED ALWAYS SET NO CYCLE RESTART SET START 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.sql deleted file mode 100644 index 1ca71a9072f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_identity_for_restart_seq.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 2 MINVALUE 1 MAXVALUE 10 CACHE 1 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.msql deleted file mode 100644 index b10ce502153..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_1_$%{}[]()&*^!@""'`\/#" TO "new_col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" TYPE real; -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.sql deleted file mode 100644 index c25fa41059c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_int.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.msql deleted file mode 100644 index fda949edfc9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - RENAME "col_5_$%{}[]()&*^!@""'`\/#" TO "new_col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric(15, 6); -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.sql deleted file mode 100644 index 124be05e100..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_numeric.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric(15,6) NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); - -GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.msql deleted file mode 100644 index 625e9fbc924..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.msql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.sql deleted file mode 100644 index 55ec33a1b38..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_remove_length.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for alter'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); - -GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.msql deleted file mode 100644 index 7922705798f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.msql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__1_$%{}[]()&*^!@""'`\/#" SET DEFAULT 'changed default value'; - -GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.sql deleted file mode 100644 index 0ce8ec23a8a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_text_with_default_value.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'changed default value'::text; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.msql deleted file mode 100644 index dac16cdedff..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.msql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__2_$%{}[]()&*^!@""'`\/#" TYPE time(6) with time zone ; -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__2_$%{}[]()&*^!@""'`\/#" SET NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" - IS 'test comment modification'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.sql deleted file mode 100644 index 382abf276e9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_timestamp_with_default_value_using_function.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__2_$%{}[]()&*^!@""'`\/#" time(6) with time zone NOT NULL DEFAULT now(); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" - IS 'test comment modification'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.msql deleted file mode 100644 index 7205d0496fe..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.msql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=2); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.sql deleted file mode 100644 index bd34ae1636a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_with_interger_array_and_options.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" - IS 'comment'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=2); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.msql deleted file mode 100644 index c256ac0b70b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.sql deleted file mode 100644 index 603ceb6cb23..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_char.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.msql deleted file mode 100644 index a9cc7a30ef7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.sql deleted file mode 100644 index 1319485df8a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_identity_for_restart_seq.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" - IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.msql deleted file mode 100644 index 41c4885a50b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.sql deleted file mode 100644 index af1c78edc4a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.msql deleted file mode 100644 index 3fa01ce4b41..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.sql deleted file mode 100644 index e8a43774660..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.msql deleted file mode 100644 index 339e0183a4f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.sql deleted file mode 100644 index f46ca745838..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_identity_by_default.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_9_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.msql deleted file mode 100644 index 5e365c07a40..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10, 5) NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.sql deleted file mode 100644 index f8a0076ecef..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_numeric.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_5_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10,5) NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" - IS 'Comment for create'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.msql deleted file mode 100644 index bb8d1d90484..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text DEFAULT 'xyz'; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.sql deleted file mode 100644 index b53dfe9d489..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_text_with_default_value.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'xyz'::text; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.msql deleted file mode 100644 index dbb64a268d2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.msql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__2_$%{}[]()&*^!@""'`\/#" time(4) with time zone DEFAULT now(); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.sql deleted file mode 100644 index 1df229a186d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_timestamp_with_default_value_using_function.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__2_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__2_$%{}[]()&*^!@""'`\/#" time(4) with time zone DEFAULT now(); - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__2_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.msql deleted file mode 100644 index 8d302791e6f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.msql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" - IS 'comment'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.sql deleted file mode 100644 index 1f219905508..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_with_interger_array_and_options.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" - --- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__3_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__3_$%{}[]()&*^!@""'`\/#" integer[] NOT NULL; - -COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__3_$%{}[]()&*^!@""'`\/#" - IS 'comment'; - -ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__3_$%{}[]()&*^!@""'`\/#" - SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/test.json deleted file mode 100644 index c4a9611ca4a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/test.json +++ /dev/null @@ -1,714 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for testing column node (v.12+)", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "table_3_$%{}[]()&*^!@\"'`\\/#", - "is_partitioned": false, - "columns": [], - "schema": "testschema" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_int.sql", - "expected_msql_file": "create_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "cltype": "real", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_int.sql", - "expected_msql_file": "alter_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Privilege change)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "attacl": { - "changed": [ - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_alt_privilege.sql", - "expected_msql_file": "alter_column_alt_privilege.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Character type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "character varying", - "collspcname": "pg_catalog.\"C\"", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "50", - "attprecision": "", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_char.sql", - "expected_msql_file": "create_column_char.msql" - }, - { - "type": "alter", - "name": "Alter Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 2, - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#", - "attlen": null, - "attstattarget": "5", - "attstorage": "p", - "description": "Comment for alter", - "cltype": "character", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_char.sql", - "expected_msql_file": "alter_column_char.msql" - }, - { - "type": "delete", - "name": "Drop Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "a", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity.sql", - "expected_msql_file": "create_column_int_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_identity.sql", - "expected_msql_file": "alter_column_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) drop identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity.sql", - "expected_msql_file": "alter_column_drop_identity.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "1 + 2 + 3", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated.sql", - "expected_msql_file": "create_column_int_generated.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 4, - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated.sql", - "expected_msql_file": "alter_column_generated.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_5_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "min_val": 0, - "max_val": 1000, - "cltype": "numeric", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "10", - "attprecision": "5", - "attidentity": "a", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_numeric.sql", - "expected_msql_file": "create_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", - "attnum": 5, - "attlen": "15", - "attprecision": "6", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_numeric.sql", - "expected_msql_file": "alter_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Remove Length)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "attlen": "" - }, - "expected_sql_file": "alter_column_remove_length.sql", - "expected_msql_file": "alter_column_remove_length.msql" - }, - { - "type": "delete", - "name": "Drop Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy1", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy2", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_8_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "dummy1 + dummy2", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated_with_existing_columns.sql", - "expected_msql_file": "create_column_int_generated_with_existing_columns.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 8, - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#", - "genexpr": "dummy1 - dummy2", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated_with_existing_columns.sql", - "expected_msql_file": "alter_column_generated_with_existing_columns.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (Generated by default)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity_by_default.sql", - "expected_msql_file": "create_column_int_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "seqincrement": "2", - "seqmax": "200", - "seqcache": "2", - "seqcycle": true, - "seqmin": "1" - }, - "expected_sql_file": "alter_column_identity_by_default.sql", - "expected_msql_file": "alter_column_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with drop identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity_by_default.sql", - "expected_msql_file": "alter_column_drop_identity_by_default.msql" - }, - { - "type": "delete", - "name": "Drop Column Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (BY DEFAULT) for combination of identity options & initiate START", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#", - "cltype": "bigint", - "attacl": [], - "description": "demo comments", - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "10", - "seqcache": "1", - "seqcycle": true, - "colconstype": "i", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_identity_for_restart_seq.sql", - "expected_msql_file": "create_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (BY DEFAULT) to ALWAYS & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnotnull": true, - "attidentity": "a", - "seqstart": 2, - "seqcycle": false - }, - "expected_sql_file": "alter_column_identity_for_restart_seq.sql", - "expected_msql_file": "alter_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (ALWAYS) for combination of identity options & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "attidentity": "a", - "seqincrement": "3", - "seqstart": "3", - "seqmin": "3", - "seqmax": "30", - "seqcache": "3", - "seqcycle": true - }, - "expected_sql_file": "alter_column_identity_for_comb_start_seq.sql", - "expected_msql_file": "alter_column_identity_for_comb_start_seq.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/test.json deleted file mode 100644 index 33fb94612c3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/test.json +++ /dev/null @@ -1,926 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for testing column node (v.12+)", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "table_3_$%{}[]()&*^!@\"'`\\/#", - "is_partitioned": false, - "columns": [], - "schema": "testschema" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_int.sql", - "expected_msql_file": "create_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "cltype": "real", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_int.sql", - "expected_msql_file": "alter_column_int.msql" - }, - { - "type": "alter", - "name": "Alter Column (Privilege change)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 1, - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "attacl": { - "changed": [ - { - "grantee": "enterprisedb", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_alt_privilege.sql", - "expected_msql_file": "alter_column_alt_privilege.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Character type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_2_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "character varying", - "collspcname": "pg_catalog.\"C\"", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "50", - "attprecision": "", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_char.sql", - "expected_msql_file": "create_column_char.msql" - }, - { - "type": "alter", - "name": "Alter Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 2, - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#", - "attlen": null, - "attstattarget": "5", - "attstorage": "p", - "description": "Comment for alter", - "cltype": "character", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_char.sql", - "expected_msql_file": "alter_column_char.msql" - }, - { - "type": "delete", - "name": "Drop Column (Character type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "a", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity.sql", - "expected_msql_file": "create_column_int_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_identity.sql", - "expected_msql_file": "alter_column_identity.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) drop identity", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity.sql", - "expected_msql_file": "alter_column_drop_identity.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "1 + 2 + 3", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated.sql", - "expected_msql_file": "create_column_int_generated.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 4, - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated.sql", - "expected_msql_file": "alter_column_generated.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_5_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "min_val": 0, - "max_val": 1000, - "cltype": "numeric", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "10", - "attprecision": "5", - "attidentity": "a", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_numeric.sql", - "expected_msql_file": "create_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", - "attnum": 5, - "attlen": "15", - "attprecision": "6", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_numeric.sql", - "expected_msql_file": "alter_column_numeric.msql" - }, - { - "type": "alter", - "name": "Alter Column (Remove Length)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 3, - "attlen": "" - }, - "expected_sql_file": "alter_column_remove_length.sql", - "expected_msql_file": "alter_column_remove_length.msql" - }, - { - "type": "delete", - "name": "Drop Column (Numeric type with Length Precision & Variables)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy1", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Dummy Column (Integer/Numeric type)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "dummy2", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "defval": "1" - } - }, - { - "type": "create", - "name": "Create Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_8_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "g", - "genexpr": "dummy1 + dummy2", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_int_generated_with_existing_columns.sql", - "expected_msql_file": "create_column_int_generated_with_existing_columns.msql" - }, - { - "type": "alter", - "name": "Alter Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 8, - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#", - "genexpr": "dummy1 - dummy2", - "description": "Comment for alter", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_generated_with_existing_columns.sql", - "expected_msql_file": "alter_column_generated_with_existing_columns.msql" - }, - { - "type": "delete", - "name": "Drop Column (Integer/Numeric type) with Generated feature with columns", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (Generated by default)", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for create", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attoptions": [], - "seclabels": [], - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "99999", - "seqcache": "10", - "seqcycle": true, - "colconstype": "i" - }, - "expected_sql_file": "create_column_int_identity_by_default.sql", - "expected_msql_file": "create_column_int_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#", - "description": "Comment for alter", - "seqincrement": "2", - "seqmax": "200", - "seqcache": "2", - "seqcycle": true, - "seqmin": "1" - }, - "expected_sql_file": "alter_column_identity_by_default.sql", - "expected_msql_file": "alter_column_identity_by_default.msql" - }, - { - "type": "alter", - "name": "Alter Column with drop identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "colconstype": "n" - }, - "expected_sql_file": "alter_column_drop_identity_by_default.sql", - "expected_msql_file": "alter_column_drop_identity_by_default.msql" - }, - { - "type": "delete", - "name": "Drop Column Column with identity (Generated by default)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with identity (BY DEFAULT) for combination of identity options & initiate START", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#", - "cltype": "bigint", - "attacl": [], - "description": "demo comments", - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attidentity": "d", - "seqincrement": "1", - "seqstart": "1", - "seqmin": "1", - "seqmax": "10", - "seqcache": "1", - "seqcycle": true, - "colconstype": "i", - "attoptions": [], - "seclabels": [] - }, - "expected_sql_file": "create_column_identity_for_restart_seq.sql", - "expected_msql_file": "create_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (BY DEFAULT) to ALWAYS & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnotnull": true, - "attidentity": "a", - "seqstart": 2, - "seqcycle": false - }, - "expected_sql_file": "alter_column_identity_for_restart_seq.sql", - "expected_msql_file": "alter_column_identity_for_restart_seq.msql" - }, - { - "type": "alter", - "name": "Alter identity Column (ALWAYS) for combination of identity options & Update START", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "attnum": 9, - "attidentity": "a", - "seqincrement": "3", - "seqstart": "3", - "seqmin": "3", - "seqmax": "30", - "seqcache": "3", - "seqcycle": true - }, - "expected_sql_file": "alter_column_identity_for_comb_start_seq.sql", - "expected_msql_file": "alter_column_identity_for_comb_start_seq.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col_6_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with text & default value", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#", - "cltype": "text", - "attacl": [], - "description": "test comment", - "is_primary_key": false, - "attnotnull": false, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [], - "defval": "'xyz'" - }, - "expected_sql_file": "create_column_text_with_default_value.sql", - "expected_msql_file": "create_column_text_with_default_value.msql" - }, - { - "type": "alter", - "name": "Alter Column with text & update default value", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#", - "defval": "'changed default value'", - "attacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_column_text_with_default_value.sql", - "expected_msql_file": "alter_column_text_with_default_value.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with time with time zone & default value using function", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#", - "cltype": "time with time zone", - "attacl": [], - "description": "test comment", - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": "4", - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [], - "defval": "now()" - }, - "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "alter", - "name": "Alter Column with time with time zone & update length", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#", - "attlen": "6", - "attnotnull": true, - "description": "test comment modification" - }, - "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", - "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__2_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with interger_array and options", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#", - "cltype": "integer[]", - "attacl": [], - "description": "comment", - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attidentity": "a", - "colconstype": "n", - "attoptions": [ - { - "name": "n_distinct", - "value": "1" - } - ], - "seclabels": [] - }, - "expected_sql_file": "create_column_with_interger_array_and_options.sql", - "expected_msql_file": "create_column_with_interger_array_and_options.msql" - }, - { - "type": "alter", - "name": "Alter Column with interger_array and options", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#", - "attoptions": { - "changed": [ - { - "name": "n_distinct", - "value": "2" - } - ] - } - }, - "expected_sql_file": "alter_column_with_interger_array_and_options.sql", - "expected_msql_file": "alter_column_with_interger_array_and_options.msql" - }, - { - "type": "delete", - "name": "Drop Column with identity (ALWAYS)", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col__3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Column with compression", - "endpoint": "NODE-column.obj", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql", - "data": { - "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", - "cltype": "character varying", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": "", - "attprecision": "", - "attcompression": "pglz", - "attoptions": [], - "seclabels": [], - "defval": "1" - }, - "expected_sql_file": "create_column_comp.sql", - "expected_msql_file": "create_column_comp.msql" - }, - { - "type": "alter", - "name": "Alter Column compression type", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "msql_endpoint": "NODE-column.msql_id", - "data": { - "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", - "attcompression": "lz4" - }, - "expected_sql_file": "alter_column_compression.sql", - "expected_msql_file": "alter_column_compression.msql" - }, - { - "type": "delete", - "name": "Drop Column with compression", - "endpoint": "NODE-column.obj_id", - "sql_endpoint": "NODE-column.sql_id", - "data": { - "name": "col_comp_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.msql index 7f5387c5147..09425ce5c1f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.msql @@ -1,2 +1,2 @@ -REVOKE ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" FROM enterprisedb; -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO enterprisedb; +REVOKE ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" FROM enterprisedb; +GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.sql index fefc11b7fd5..75bc1ddf4c8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_alt_privilege.sql @@ -1,13 +1,13 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; -GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO enterprisedb; +GRANT INSERT("new_col_1_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.msql index a5398f97efd..b34f0e9fb10 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.msql @@ -1,15 +1,15 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" RENAME "col_2_$%{}[]()&*^!@""'`\/#" TO "new_col_2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" TYPE character COLLATE pg_catalog."C"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.sql index e4b7935866f..6ac8f813c47 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_char.sql @@ -1,17 +1,17 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" character(1) COLLATE pg_catalog."C"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STATISTICS 5; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_2_$%{}[]()&*^!@""'`\/#" SET STORAGE PLAIN; -GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_2_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_2_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_2_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/alter_column_compression.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_compression.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/alter_column_compression.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_compression.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/alter_column_compression.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_compression.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/alter_column_compression.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_compression.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.msql index 245a8e68003..64cef6b0f2c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.sql index 581071b7432..52dab98e319 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.msql index b4a68709364..66e8d38309b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" DROP IDENTITY; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.sql index ae0b66011d2..0b4c8460684 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_drop_identity_by_default.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated_with_existing_columns.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated_with_existing_columns.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated_with_existing_columns.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated_with_existing_columns.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated_with_existing_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated_with_existing_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/alter_column_generated_with_existing_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_generated_with_existing_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.msql index 3ccc61d2de9..776c9c2b6c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.msql @@ -1,7 +1,7 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" RENAME "col_3_$%{}[]()&*^!@""'`\/#" TO "new_col_3_$%{}[]()&*^!@""'`\/#"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.sql index 10eb60fdd8a..4c7c3dbcab2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT INSERT("new_col_3_$%{}[]()&*^!@""'`\/#"), SELECT("new_col_3_$%{}[]()&*^!@""'`\/#"), REFERENCES("new_col_3_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.msql index 14008b508e1..8e93d209b11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.msql @@ -1,8 +1,8 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - RENAME "col_5_$%{}[]()&*^!@""'`\/#" TO "new_col_5_$%{}[]()&*^!@""'`\/#"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + RENAME "col_9_$%{}[]()&*^!@""'`\/#" TO "new_col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 2 SET MINVALUE 1 SET MAXVALUE 200 SET CACHE 2; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 2 SET MINVALUE 1 SET MAXVALUE 200 SET CACHE 2; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.sql index 8ba00535482..77eec335834 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_by_default.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 2 START 1 MINVALUE 1 MAXVALUE 200 CACHE 2 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 2 START 1 MINVALUE 1 MAXVALUE 200 CACHE 2 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.msql index f70ad836a01..11798454b01 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET CYCLE SET INCREMENT 3 RESTART SET START 3 SET MINVALUE 3 SET MAXVALUE 30 SET CACHE 3; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.sql index 43f66e22056..16c198ec2ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_comb_start_seq.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 3 START 3 MINVALUE 3 MAXVALUE 30 CACHE 3 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 3 START 3 MINVALUE 3 MAXVALUE 30 CACHE 3 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.msql index 2878a1d1b82..443b74cac36 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.msql @@ -1,2 +1,2 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "col_6_$%{}[]()&*^!@""'`\/#" SET GENERATED ALWAYS SET NO CYCLE RESTART SET START 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.sql index d0d693ab961..1ca71a9072f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_identity_for_restart_seq.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 2 MINVALUE 1 MAXVALUE 10 CACHE 1 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 2 MINVALUE 1 MAXVALUE 10 CACHE 1 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.msql index 31a650287e7..b10ce502153 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" RENAME "col_1_$%{}[]()&*^!@""'`\/#" TO "new_col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" ALTER COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" TYPE real; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.sql index 207bc646f97..c25fa41059c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_int.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.msql index 8f400900f93..fda949edfc9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - RENAME "col_4_$%{}[]()&*^!@""'`\/#" TO "new_col_4_$%{}[]()&*^!@""'`\/#"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + RENAME "col_5_$%{}[]()&*^!@""'`\/#" TO "new_col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" TYPE numeric(15, 6); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric(15, 6); +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -GRANT ALL("new_col_4_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.sql index 45f6e03cff7..124be05e100 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_numeric.sql @@ -1,15 +1,15 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#" numeric(15,6) NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric(15,6) NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); -GRANT ALL("new_col_4_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.msql index e2ffd2c854b..625e9fbc924 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.msql @@ -1,2 +1,2 @@ -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" TYPE numeric; +ALTER TABLE testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" TYPE numeric; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.sql index 96a9438dcdb..55ec33a1b38 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_remove_length.sql @@ -1,15 +1,15 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "new_col_4_$%{}[]()&*^!@""'`\/#" numeric NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" numeric NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."new_col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for alter'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "new_col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "new_col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); -GRANT ALL("new_col_4_$%{}[]()&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL("new_col_5_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.msql index d77388f63d9..7922705798f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.msql @@ -1,13 +1,4 @@ -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - RENAME "col__1_$%{}[]()&*^!@""'`\/#" TO "col__1_$%{}[]&*^!@""'`\/#"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "col__1_$%{}[]()&*^!@""'`\/#" SET DEFAULT 'changed default value'; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__1_$%{}[]&*^!@""'`\/#" SET DEFAULT 'changed default value'::text; - -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col__1_$%{}[]&*^!@""'`\/#" DROP NOT NULL; - -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]&*^!@""'`\/#" - IS 'test comment modify'; - -GRANT SELECT("col__1_$%{}[]&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.sql index 31e9cf7b9f9..0ce8ec23a8a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_text_with_default_value.sql @@ -1,11 +1,11 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN "col__1_$%{}[]&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col__1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col__1_$%{}[]&*^!@""'`\/#" text COLLATE pg_catalog."C" DEFAULT 'changed default value'::text; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col__1_$%{}[]()&*^!@""'`\/#" text COLLATE pg_catalog."default" DEFAULT 'changed default value'::text; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]&*^!@""'`\/#" - IS 'test comment modify'; +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col__1_$%{}[]()&*^!@""'`\/#" + IS 'test comment'; -GRANT SELECT("col__1_$%{}[]&*^!@""'`\/#") ON testschema."table_2_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT SELECT("col__1_$%{}[]()&*^!@""'`\/#") ON testschema."table_3_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_timestamp_with_default_value_using_function.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_timestamp_with_default_value_using_function.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_with_interger_array_and_options.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_with_interger_array_and_options.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_with_interger_array_and_options.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_with_interger_array_and_options.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_with_interger_array_and_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_with_interger_array_and_options.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/alter_column_with_interger_array_and_options.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/alter_column_with_interger_array_and_options.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.msql index b07eb190e9b..c256ac0b70b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.sql index 51559b69ea0..603ceb6cb23 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_char.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_2_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_2_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_2_$%{}[]()&*^!@""'`\/#" character varying(50) COLLATE pg_catalog."C"; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_2_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/create_column_comp.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_comp.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/create_column_comp.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_comp.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/create_column_comp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_comp.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/14_plus/create_column_comp.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_comp.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.msql index 2d778d1c5e3..a9cc7a30ef7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.sql index 8f7c7a3a41e..1319485df8a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_identity_for_restart_seq.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_6_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_6_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 10 CACHE 1 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_6_$%{}[]()&*^!@""'`\/#" IS 'demo comments'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.msql index ec7d70ac7c1..41c4885a50b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.sql index e62203d826a..af1c78edc4a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_1_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_1_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_1_$%{}[]()&*^!@""'`\/#" bigint NOT NULL DEFAULT 1; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_1_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated_with_existing_columns.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated_with_existing_columns.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated_with_existing_columns.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated_with_existing_columns.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated_with_existing_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated_with_existing_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/12_plus/create_column_int_generated_with_existing_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_generated_with_existing_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.msql index 37cc1d69a62..3fa01ce4b41 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.sql index d0374bdd3d9..e8a43774660 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_3_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_3_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_3_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED ALWAYS AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_3_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.msql index 369cf079082..339e0183a4f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.msql @@ -1,5 +1,5 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.sql index dcb9e56484f..f46ca745838 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_int_identity_by_default.sql @@ -1,9 +1,9 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_5_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_9_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_5_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_9_$%{}[]()&*^!@""'`\/#" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY ( CYCLE INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 99999 CACHE 10 ); -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_9_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.msql index 08d2390d897..5e365c07a40 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.msql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.msql @@ -1,9 +1,9 @@ -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_4_$%{}[]()&*^!@""'`\/#" numeric(10, 5) NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10, 5) NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.sql index f14a913566d..f8a0076ecef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_numeric.sql @@ -1,13 +1,13 @@ --- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_4_$%{}[]()&*^!@""'`\/#" +-- Column: testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" --- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_4_$%{}[]()&*^!@""'`\/#"; +-- ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col_5_$%{}[]()&*^!@""'`\/#"; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col_4_$%{}[]()&*^!@""'`\/#" numeric(10,5) NOT NULL; +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ADD COLUMN "col_5_$%{}[]()&*^!@""'`\/#" numeric(10,5) NOT NULL; -COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."col_4_$%{}[]()&*^!@""'`\/#" +COMMENT ON COLUMN testschema."table_3_$%{}[]()&*^!@""'`\/#"."col_5_$%{}[]()&*^!@""'`\/#" IS 'Comment for create'; -ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN "col_4_$%{}[]()&*^!@""'`\/#" +ALTER TABLE IF EXISTS testschema."table_3_$%{}[]()&*^!@""'`\/#" + ALTER COLUMN "col_5_$%{}[]()&*^!@""'`\/#" SET (n_distinct=1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_text_with_default_value.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_text_with_default_value.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_text_with_default_value.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_text_with_default_value.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_text_with_default_value.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_text_with_default_value.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_text_with_default_value.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_text_with_default_value.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_timestamp_with_default_value_using_function.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_timestamp_with_default_value_using_function.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_with_interger_array_and_options.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_with_interger_array_and_options.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_with_interger_array_and_options.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_with_interger_array_and_options.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_with_interger_array_and_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_with_interger_array_and_options.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/12_plus/create_column_with_interger_array_and_options.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/create_column_with_interger_array_and_options.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/test.json index b242dd51de2..33fb94612c3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/ppas/default/test.json @@ -2,11 +2,11 @@ "scenarios": [ { "type": "create", - "name": "Create Table for testing column node (v.10+)", + "name": "Create Table for testing column node (v.12+)", "endpoint": "NODE-table.obj", "sql_endpoint": "NODE-table.sql_id", "data": { - "name": "table_2_$%{}[]()&*^!@\"'`\\/#", + "name": "table_3_$%{}[]()&*^!@\"'`\\/#", "is_partitioned": false, "columns": [], "schema": "testschema" @@ -50,7 +50,7 @@ "added": [ { "grantee": "PUBLIC", - "grantor": "enteprisedb", + "grantor": "enterprisedb", "privileges": [ { "privilege_type": "a", @@ -89,7 +89,6 @@ "data": { "attnum": 1, "name": "new_col_1_$%{}[]()&*^!@\"'`\\/#", - "cltype": "real", "attacl": { "changed": [ { @@ -289,13 +288,85 @@ }, { "type": "create", - "name": "Create Column (Numeric type with Length Precision & Variables)", + "name": "Create Column (Integer/Numeric type) with Generated feature", "endpoint": "NODE-column.obj", "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql", "data": { "name": "col_4_$%{}[]()&*^!@\"'`\\/#", "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": "", + "attprecision": "", + "attidentity": "a", + "colconstype": "g", + "genexpr": "1 + 2 + 3", + "attoptions": [], + "seclabels": [] + }, + "expected_sql_file": "create_column_int_generated.sql", + "expected_msql_file": "create_column_int_generated.msql" + }, + { + "type": "alter", + "name": "Alter Column (Integer/Numeric type) with Generated feature", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "attnum": 4, + "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", + "description": "Comment for alter", + "attacl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_column_generated.sql", + "expected_msql_file": "alter_column_generated.msql" + }, + { + "type": "delete", + "name": "Drop Column (Integer/Numeric type)", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Column (Numeric type with Length Precision & Variables)", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col_5_$%{}[]()&*^!@\"'`\\/#", + "description": "Comment for create", "min_val": 0, "max_val": 1000, "cltype": "numeric", @@ -323,8 +394,8 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql_id", "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#", - "attnum": 4, + "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", + "attnum": 5, "attlen": "15", "attprecision": "6", "description": "Comment for alter", @@ -381,7 +452,120 @@ "endpoint": "NODE-column.obj_id", "sql_endpoint": "NODE-column.sql_id", "data": { - "name": "new_col_4_$%{}[]()&*^!@\"'`\\/#" + "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Dummy Column (Integer/Numeric type)", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "dummy1", + "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attoptions": [], + "seclabels": [], + "defval": "1" + } + }, + { + "type": "create", + "name": "Create Dummy Column (Integer/Numeric type)", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "dummy2", + "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attoptions": [], + "seclabels": [], + "defval": "1" + } + }, + { + "type": "create", + "name": "Create Column (Integer/Numeric type) with Generated feature with columns", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col_8_$%{}[]()&*^!@\"'`\\/#", + "description": "Comment for create", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": "", + "attprecision": "", + "attidentity": "a", + "colconstype": "g", + "genexpr": "dummy1 + dummy2", + "attoptions": [], + "seclabels": [] + }, + "expected_sql_file": "create_column_int_generated_with_existing_columns.sql", + "expected_msql_file": "create_column_int_generated_with_existing_columns.msql" + }, + { + "type": "alter", + "name": "Alter Column (Integer/Numeric type) with Generated feature with columns", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "attnum": 8, + "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#", + "genexpr": "dummy1 - dummy2", + "description": "Comment for alter", + "attacl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_column_generated_with_existing_columns.sql", + "expected_msql_file": "alter_column_generated_with_existing_columns.msql" + }, + { + "type": "delete", + "name": "Drop Column (Integer/Numeric type) with Generated feature with columns", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "new_col_8_$%{}[]()&*^!@\"'`\\/#" } }, { @@ -391,7 +575,7 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql", "data": { - "name": "col_5_$%{}[]()&*^!@\"'`\\/#", + "name": "col_9_$%{}[]()&*^!@\"'`\\/#", "description": "Comment for create", "cltype": "bigint", "attacl": [], @@ -420,8 +604,8 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql_id", "data": { - "attnum": 5, - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#", + "attnum": 9, + "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#", "description": "Comment for alter", "seqincrement": "2", "seqmax": "200", @@ -439,7 +623,7 @@ "sql_endpoint": "NODE-column.sql_id", "msql_endpoint": "NODE-column.msql_id", "data": { - "attnum": 5, + "attnum": 9, "colconstype": "n" }, "expected_sql_file": "alter_column_drop_identity_by_default.sql", @@ -451,7 +635,7 @@ "endpoint": "NODE-column.obj_id", "sql_endpoint": "NODE-column.sql_id", "data": { - "name": "new_col_5_$%{}[]()&*^!@\"'`\\/#" + "name": "new_col_9_$%{}[]()&*^!@\"'`\\/#" } }, { @@ -525,6 +709,218 @@ "data": { "name": "col_6_$%{}[]()&*^!@\"'`\\/#" } + }, + { + "type": "create", + "name": "Create Column with text & default value", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col__1_$%{}[]()&*^!@\"'`\\/#", + "cltype": "text", + "attacl": [], + "description": "test comment", + "is_primary_key": false, + "attnotnull": false, + "attlen": "", + "attprecision": "", + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [], + "defval": "'xyz'" + }, + "expected_sql_file": "create_column_text_with_default_value.sql", + "expected_msql_file": "create_column_text_with_default_value.msql" + }, + { + "type": "alter", + "name": "Alter Column with text & update default value", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "name": "col__1_$%{}[]()&*^!@\"'`\\/#", + "defval": "'changed default value'", + "attacl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "", + "privileges": [ + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_column_text_with_default_value.sql", + "expected_msql_file": "alter_column_text_with_default_value.msql" + }, + { + "type": "delete", + "name": "Drop Column with identity (ALWAYS)", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "col__1_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Column with time with time zone & default value using function", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col__2_$%{}[]()&*^!@\"'`\\/#", + "cltype": "time with time zone", + "attacl": [], + "description": "test comment", + "min_val_attlen": 0, + "max_val_attlen": 6, + "is_primary_key": false, + "attnotnull": false, + "attlen": "4", + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [], + "defval": "now()" + }, + "expected_sql_file": "create_column_timestamp_with_default_value_using_function.sql", + "expected_msql_file": "create_column_timestamp_with_default_value_using_function.msql" + }, + { + "type": "alter", + "name": "Alter Column with time with time zone & update length", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "name": "col__2_$%{}[]()&*^!@\"'`\\/#", + "attlen": "6", + "attnotnull": true, + "description": "test comment modification" + }, + "expected_sql_file": "alter_column_timestamp_with_default_value_using_function.sql", + "expected_msql_file": "alter_column_timestamp_with_default_value_using_function.msql" + }, + { + "type": "delete", + "name": "Drop Column with identity (ALWAYS)", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "col__2_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Column with interger_array and options", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col__3_$%{}[]()&*^!@\"'`\\/#", + "cltype": "integer[]", + "attacl": [], + "description": "comment", + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attidentity": "a", + "colconstype": "n", + "attoptions": [ + { + "name": "n_distinct", + "value": "1" + } + ], + "seclabels": [] + }, + "expected_sql_file": "create_column_with_interger_array_and_options.sql", + "expected_msql_file": "create_column_with_interger_array_and_options.msql" + }, + { + "type": "alter", + "name": "Alter Column with interger_array and options", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "name": "col__3_$%{}[]()&*^!@\"'`\\/#", + "attoptions": { + "changed": [ + { + "name": "n_distinct", + "value": "2" + } + ] + } + }, + "expected_sql_file": "alter_column_with_interger_array_and_options.sql", + "expected_msql_file": "alter_column_with_interger_array_and_options.msql" + }, + { + "type": "delete", + "name": "Drop Column with identity (ALWAYS)", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "col__3_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Column with compression", + "endpoint": "NODE-column.obj", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql", + "data": { + "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", + "cltype": "character varying", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": "", + "attprecision": "", + "attcompression": "pglz", + "attoptions": [], + "seclabels": [], + "defval": "1" + }, + "expected_sql_file": "create_column_comp.sql", + "expected_msql_file": "create_column_comp.msql" + }, + { + "type": "alter", + "name": "Alter Column compression type", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "msql_endpoint": "NODE-column.msql_id", + "data": { + "name": "col_comp_$%{}[]()&*^!@\"'`\\/#", + "attcompression": "lz4" + }, + "expected_sql_file": "alter_column_compression.sql", + "expected_msql_file": "alter_column_compression.msql" + }, + { + "type": "delete", + "name": "Drop Column with compression", + "endpoint": "NODE-column.obj_id", + "sql_endpoint": "NODE-column.sql_id", + "data": { + "name": "col_comp_$%{}[]()&*^!@\"'`\\/#" + } } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/alter_event_comment_code.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/alter_event_comment_code.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/alter_event_comment_code.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/alter_event_comment_code.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_all_event.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_all_event.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_all_event.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_all_event.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_insert_delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_insert_delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_insert_delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_insert_delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_insert_update_on_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_insert_update_on_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_insert_update_on_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_insert_update_on_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_insert_with_when.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_insert_with_when.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/create_for_insert_with_when.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/create_for_insert_with_when.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/12_plus/test.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/tests/ppas/default/test.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint.sql deleted file mode 100644 index 5299ca36c50..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Constraint: Exclusion_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tableforexclusion DROP CONSTRAINT IF EXISTS "Exclusion_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#a" EXCLUDE USING btree ( - col2 text_pattern_ops WITH =) - INCLUDE (col1) - WITH (FILLFACTOR=98) - WHERE (col1 > 1) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#a" ON testschema.tableforexclusion - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint_msql.sql deleted file mode 100644 index 8215678172a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/alter_exclusion_constraint_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE IF EXISTS testschema.tableforexclusion - RENAME CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" TO "Exclusion_$%{}[]()&*^!@""'`\/#a"; -ALTER INDEX IF EXISTS testschema."Exclusion_$%{}[]()&*^!@""'`\/#a" - SET (FILLFACTOR=98); -COMMENT ON CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#a" ON testschema.tableforexclusion - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint.sql deleted file mode 100644 index 5c58c601c04..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Constraint: Exclusion_$%{}[]()&*^!@"'`\/# - --- ALTER TABLE IF EXISTS testschema.tableforexclusion DROP CONSTRAINT IF EXISTS "Exclusion_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING btree ( - col2 text_pattern_ops WITH =) - INCLUDE (col1) - WITH (FILLFACTOR=12) - WHERE (col1 > 1) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" ON testschema.tableforexclusion - IS 'Comment for create'; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql deleted file mode 100644 index de8254a7761..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Constraint: Exclusion_$%{}[]()&*^!@"'`\/# - --- ALTER TABLE IF EXISTS testschema.tableforexclusion DROP CONSTRAINT IF EXISTS "Exclusion_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING gist ( - col2 WITH <>, - (col1 + col3) WITH <>) - WITH (FILLFACTOR=12) - WHERE (col1 > 1) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" ON testschema.tableforexclusion - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_msql.sql deleted file mode 100644 index c1512a17111..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING btree ( - col2 text_pattern_ops WITH =) - INCLUDE (col1) - WITH (FILLFACTOR=12) - WHERE (col1 > 1) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" ON testschema.tableforexclusion - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/test.json deleted file mode 100644 index 73f6af4a89b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/test.json +++ /dev/null @@ -1,183 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tableforexclusion", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "col2", - "cltype": "text" - }, - { - "name": "col3", - "cltype": "integer" - } - ], - "is_partitioned": false, - "schema": "testschema", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "btree_gist", - "version": "", - "relocatable": true - } - }, - { - "type": "create", - "name": "Create Exclusion Constraint", - "endpoint": "NODE-exclusion_constraint.obj", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#", - "comment": "Comment for create", - "fillfactor": "12", - "amname": "btree", - "condeferrable": true, - "condeferred": true, - "indconstraint": "col1 > 1", - "columns": [ - { - "column": "col2", - "col_type": "text", - "order": false, - "nulls_order": false, - "operator": "=", - "oper_class": "text_pattern_ops" - } - ], - "include": [ - "col1" - ] - }, - "expected_sql_file": "create_exclusion_constraint.sql", - "expected_msql_file": "create_exclusion_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Exclusion Constraint", - "endpoint": "NODE-exclusion_constraint.obj_id", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "msql_endpoint": "NODE-exclusion_constraint.msql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#a", - "comment": "Comment for alter", - "fillfactor": "98" - }, - "expected_sql_file": "alter_exclusion_constraint.sql", - "expected_msql_file": "alter_exclusion_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Drop Exclusion Constraint", - "endpoint": "NODE-exclusion_constraint.delete_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#a" - } - }, - { - "type": "create", - "name": "Create Exclusion Constraint with expressions", - "endpoint": "NODE-exclusion_constraint.obj", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#", - "comment": "Comment for create", - "fillfactor": "12", - "amname": "gist", - "condeferrable": true, - "condeferred": true, - "indconstraint": "col1 > 1", - "columns": [ - { - "column": "col2", - "order": false, - "nulls_order": false, - "operator": "<>", - "is_sort_nulls_applicable": false, - "is_exp": false - }, - { - "column": "(col1+col3)", - "order": false, - "nulls_order": false, - "operator": "<>", - "is_sort_nulls_applicable": false, - "is_exp": true - } - ] - }, - "expected_sql_file": "create_exclusion_constraint_exp.sql", - "expected_msql_file": "create_exclusion_constraint_exp_msql.sql" - }, - { - "type": "delete", - "name": "Drop Exclusion Constraint", - "endpoint": "NODE-exclusion_constraint.delete_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a" - } - }, - { - "type": "create", - "name": "Create Exclusion Constraint to remove Fillfactor", - "endpoint": "NODE-exclusion_constraint.obj", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1", - "comment": "Comment for create", - "fillfactor": "12", - "amname": "gist", - "columns": [ - { - "column": "col2", - "order": false, - "nulls_order": false, - "operator": "<>", - "is_sort_nulls_applicable": false, - "is_exp": false - } - ] - }, - "expected_sql_file": "create_without_fillfactor.sql" - }, - { - "type": "alter", - "name": "Alter Exclusion Constraint to remove Fillfactor", - "endpoint": "NODE-exclusion_constraint.obj_id", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "msql_endpoint": "NODE-exclusion_constraint.msql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a", - "comment": "Comment for alter", - "fillfactor": "" - }, - "expected_sql_file": "alter_without_fillfactor.sql", - "expected_msql_file": "alter_without_fillfactor_msql.sql" - }, - { - "type": "delete", - "name": "Drop Exclusion Constraint", - "endpoint": "NODE-exclusion_constraint.delete_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/alter_exclusion_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/alter_exclusion_constraint.sql index 22a257b15c5..5299ca36c50 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/alter_exclusion_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/alter_exclusion_constraint.sql @@ -3,8 +3,9 @@ -- ALTER TABLE IF EXISTS testschema.tableforexclusion DROP CONSTRAINT IF EXISTS "Exclusion_$%{}[]()&*^!@""'`\/#a"; ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#a" EXCLUDE USING gist ( - col2 WITH <>) + ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#a" EXCLUDE USING btree ( + col2 text_pattern_ops WITH =) + INCLUDE (col1) WITH (FILLFACTOR=98) WHERE (col1 > 1) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint.sql index eb8df9274fc..5c58c601c04 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint.sql @@ -3,11 +3,13 @@ -- ALTER TABLE IF EXISTS testschema.tableforexclusion DROP CONSTRAINT IF EXISTS "Exclusion_$%{}[]()&*^!@""'`\/#"; ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING gist ( - col2 WITH <>) + ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING btree ( + col2 text_pattern_ops WITH =) + INCLUDE (col1) WITH (FILLFACTOR=12) WHERE (col1 > 1) DEFERRABLE INITIALLY DEFERRED; COMMENT ON CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" ON testschema.tableforexclusion IS 'Comment for create'; + diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/11_plus/create_exclusion_constraint_exp_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_exp_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_msql.sql index 9cab40ea351..c1512a17111 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/create_exclusion_constraint_msql.sql @@ -1,6 +1,7 @@ ALTER TABLE IF EXISTS testschema.tableforexclusion - ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING gist ( - col2 WITH <>) + ADD CONSTRAINT "Exclusion_$%{}[]()&*^!@""'`\/#" EXCLUDE USING btree ( + col2 text_pattern_ops WITH =) + INCLUDE (col1) WITH (FILLFACTOR=12) WHERE (col1 > 1) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/test.json index 3f46c3ef1fe..73f6af4a89b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/tests/default/test.json @@ -48,19 +48,22 @@ "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#", "comment": "Comment for create", "fillfactor": "12", - "amname": "gist", + "amname": "btree", "condeferrable": true, "condeferred": true, "indconstraint": "col1 > 1", "columns": [ { "column": "col2", + "col_type": "text", "order": false, "nulls_order": false, - "operator": "<>", - "is_sort_nulls_applicable": false, - "is_exp": false + "operator": "=", + "oper_class": "text_pattern_ops" } + ], + "include": [ + "col1" ] }, "expected_sql_file": "create_exclusion_constraint.sql", @@ -88,51 +91,6 @@ "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#a" } }, - { - "type": "create", - "name": "Create Exclusion Constraint to remove Fillfactor", - "endpoint": "NODE-exclusion_constraint.obj", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1", - "comment": "Comment for create", - "fillfactor": "12", - "amname": "gist", - "columns": [ - { - "column": "col2", - "order": false, - "nulls_order": false, - "operator": "<>", - "is_sort_nulls_applicable": false, - "is_exp": false - } - ] - }, - "expected_sql_file": "create_without_fillfactor.sql" - }, - { - "type": "alter", - "name": "Alter Exclusion Constraint to remove Fillfactor", - "endpoint": "NODE-exclusion_constraint.obj_id", - "sql_endpoint": "NODE-exclusion_constraint.sql_id", - "msql_endpoint": "NODE-exclusion_constraint.msql_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a", - "comment": "Comment for alter", - "fillfactor": "" - }, - "expected_sql_file": "alter_without_fillfactor.sql", - "expected_msql_file": "alter_without_fillfactor_msql.sql" - }, - { - "type": "delete", - "name": "Drop Exclusion Constraint", - "endpoint": "NODE-exclusion_constraint.delete_id", - "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a" - } - }, { "type": "create", "name": "Create Exclusion Constraint with expressions", @@ -166,7 +124,7 @@ ] }, "expected_sql_file": "create_exclusion_constraint_exp.sql", - "expected_msql_file": "exclusion_constraint_exp_msql.sql" + "expected_msql_file": "create_exclusion_constraint_exp_msql.sql" }, { "type": "delete", @@ -178,17 +136,14 @@ }, { "type": "create", - "name": "Create Exclusion Constraint with expressions", + "name": "Create Exclusion Constraint to remove Fillfactor", "endpoint": "NODE-exclusion_constraint.obj", "sql_endpoint": "NODE-exclusion_constraint.sql_id", "data": { - "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#", + "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1", "comment": "Comment for create", "fillfactor": "12", "amname": "gist", - "condeferrable": true, - "condeferred": true, - "indconstraint": "col1 > 1", "columns": [ { "column": "col2", @@ -197,19 +152,32 @@ "operator": "<>", "is_sort_nulls_applicable": false, "is_exp": false - }, - { - "column": "(col1+col3)", - "order": false, - "nulls_order": false, - "operator": "<>", - "is_sort_nulls_applicable": false, - "is_exp": true } ] }, - "expected_sql_file": "create_exclusion_constraint_exp.sql", - "expected_msql_file": "exclusion_constraint_exp_msql.sql" + "expected_sql_file": "create_without_fillfactor.sql" + }, + { + "type": "alter", + "name": "Alter Exclusion Constraint to remove Fillfactor", + "endpoint": "NODE-exclusion_constraint.obj_id", + "sql_endpoint": "NODE-exclusion_constraint.sql_id", + "msql_endpoint": "NODE-exclusion_constraint.msql_id", + "data": { + "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a", + "comment": "Comment for alter", + "fillfactor": "" + }, + "expected_sql_file": "alter_without_fillfactor.sql", + "expected_msql_file": "alter_without_fillfactor_msql.sql" + }, + { + "type": "delete", + "name": "Drop Exclusion Constraint", + "endpoint": "NODE-exclusion_constraint.delete_id", + "data": { + "name": "Exclusion_$%{}[]()&*^!@\"'`\\/#_1a" + } } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint.sql deleted file mode 100644 index ee3ad60881e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Constraint: Pk_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons DROP CONSTRAINT IF EXISTS "Pk_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" PRIMARY KEY (col1) - INCLUDE (col2) - WITH (FILLFACTOR=90) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_primary_key_cons - IS 'Comment for alter'; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_msql.sql deleted file mode 100644 index a309837aaed..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE testschema.tablefor_primary_key_cons - RENAME CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" TO "Pk_$%{}[]()&*^!@""'`\/#a"; -ALTER INDEX testschema."Pk_$%{}[]()&*^!@""'`\/#a" - SET (FILLFACTOR=90); -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_primary_key_cons - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index.sql deleted file mode 100644 index cc84e9d4be0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Constraint: Pk_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons DROP CONSTRAINT IF EXISTS "Pk_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" PRIMARY KEY (col1) - WITH (FILLFACTOR=90); - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_primary_key_cons - IS 'Comment for alter'; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index_msql.sql deleted file mode 100644 index a309837aaed..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_constraint_with_index_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE testschema.tablefor_primary_key_cons - RENAME CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" TO "Pk_$%{}[]()&*^!@""'`\/#a"; -ALTER INDEX testschema."Pk_$%{}[]()&*^!@""'`\/#a" - SET (FILLFACTOR=90); -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_primary_key_cons - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor.sql deleted file mode 100644 index a7cf8983f92..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Constraint: Pk_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons DROP CONSTRAINT IF EXISTS "Pk_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" PRIMARY KEY (col1) - INCLUDE (col2) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_primary_key_cons - IS 'Comment for alter'; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor_msql.sql deleted file mode 100644 index 72bc1bb22bd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_pkey_reset_fillfactor_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER INDEX testschema."Pk_$%{}[]()&*^!@""'`\/#a" - RESET (FILLFACTOR); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint.sql deleted file mode 100644 index bdf4b75dd13..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Constraint: UC_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tablefor_unique_cons DROP CONSTRAINT IF EXISTS "UC_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" UNIQUE (col1) - INCLUDE (col2) - WITH (FILLFACTOR=90) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_unique_cons - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_msql.sql deleted file mode 100644 index 7d1f9e45ab1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE testschema.tablefor_unique_cons - RENAME CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" TO "UC_$%{}[]()&*^!@""'`\/#a"; -ALTER INDEX testschema."UC_$%{}[]()&*^!@""'`\/#a" - SET (FILLFACTOR=90); -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_unique_cons - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index.sql deleted file mode 100644 index b5e51d0ec2b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index.sql +++ /dev/null @@ -1,11 +0,0 @@ --- Constraint: UC_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tablefor_unique_cons DROP CONSTRAINT IF EXISTS "UC_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" UNIQUE (col1) - WITH (FILLFACTOR=90); - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_unique_cons - IS 'Comment for alter'; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index_msql.sql deleted file mode 100644 index 7d1f9e45ab1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_constraint_with_index_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE testschema.tablefor_unique_cons - RENAME CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" TO "UC_$%{}[]()&*^!@""'`\/#a"; -ALTER INDEX testschema."UC_$%{}[]()&*^!@""'`\/#a" - SET (FILLFACTOR=90); -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_unique_cons - IS 'Comment for alter'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor.sql deleted file mode 100644 index 446b3727b35..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Constraint: UC_$%{}[]()&*^!@"'`\/#a - --- ALTER TABLE IF EXISTS testschema.tablefor_unique_cons DROP CONSTRAINT IF EXISTS "UC_$%{}[]()&*^!@""'`\/#a"; - -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" UNIQUE (col1) - INCLUDE (col2) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_unique_cons - IS 'Comment for alter'; - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor_msql.sql deleted file mode 100644 index 4560538d433..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/alter_unique_reset_fillfactor_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER INDEX testschema."UC_$%{}[]()&*^!@""'`\/#a" - RESET (FILLFACTOR); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint.sql deleted file mode 100644 index 15a7a62b9bd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Constraint: Pk_$%{}[]()&*^!@"'`\/# - --- ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons DROP CONSTRAINT IF EXISTS "Pk_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" PRIMARY KEY (col1) - INCLUDE (col2) - WITH (FILLFACTOR=20) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_primary_key_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_msql.sql deleted file mode 100644 index 8fede9bcbc2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" PRIMARY KEY (col1) - INCLUDE (col2) - WITH (FILLFACTOR=20) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_primary_key_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index.sql deleted file mode 100644 index 02a1113ade5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index.sql +++ /dev/null @@ -1,10 +0,0 @@ --- Constraint: Pk_$%{}[]()&*^!@"'`\/# - --- ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons DROP CONSTRAINT IF EXISTS "Pk_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" PRIMARY KEY (col1) - WITH (FILLFACTOR=20); - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_primary_key_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index_msql.sql deleted file mode 100644 index ff467215468..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_pkey_constraint_with_index_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons - ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" PRIMARY KEY USING INDEX uindex; - -COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_primary_key_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint.sql deleted file mode 100644 index ace1282238c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Constraint: UC_$%{}[]()&*^!@"'`\/# - --- ALTER TABLE IF EXISTS testschema.tablefor_unique_cons DROP CONSTRAINT IF EXISTS "UC_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" UNIQUE (col1) - INCLUDE (col2) - WITH (FILLFACTOR=20) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_unique_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_msql.sql deleted file mode 100644 index 83c4e1804ee..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" UNIQUE (col1) - INCLUDE (col2) - WITH (FILLFACTOR=20) - DEFERRABLE INITIALLY DEFERRED; - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_unique_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index.sql deleted file mode 100644 index 76fd9e54679..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index.sql +++ /dev/null @@ -1,10 +0,0 @@ --- Constraint: UC_$%{}[]()&*^!@"'`\/# - --- ALTER TABLE IF EXISTS testschema.tablefor_unique_cons DROP CONSTRAINT IF EXISTS "UC_$%{}[]()&*^!@""'`\/#"; - -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" UNIQUE (col1) - WITH (FILLFACTOR=20); - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_unique_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index_msql.sql deleted file mode 100644 index 7025378c32a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/create_unique_constraint_with_index_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS testschema.tablefor_unique_cons - ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" UNIQUE USING INDEX uindex; - -COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" ON testschema.tablefor_unique_cons - IS 'Comment for create'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_primary_key.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_primary_key.json deleted file mode 100644 index f231e6581f9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_primary_key.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tablefor_primary_key_cons", - "columns": [{ - "name": "col1", - "cltype": "integer", - "is_primary_key": false - }, { - "name": "col2", - "cltype": "integer", - "is_primary_key": false - }], - "is_partitioned": false, - "schema": "testschema", - "spcname": "pg_default" - }, - "store_object_id": true - }, { - "type": "create", - "name": "Create Index", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "data": { - "name": "uindex", - "spcname": "pg_default", - "amname": "btree", - "columns": [{ - "colname": "col1", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": true - }], - "indisunique": true, - "fillfactor": 20 - } - }, { - "type": "create", - "name": "Create Primary Key Constraint -- 11 Plus", - "endpoint": "NODE-primary_key.obj", - "sql_endpoint": "NODE-primary_key.sql_id", - "msql_endpoint": "NODE-primary_key.msql", - "data": { - "name": "Pk_$%{}[]()&*^!@\"'`\\/#", - "comment": "Comment for create", - "fillfactor": 20, - "columns": [{"column":"col1"}], - "include": ["col2"], - "condeferrable": true, - "condeferred": true - }, - "expected_sql_file": "create_pkey_constraint.sql", - "expected_msql_file": "create_pkey_constraint_msql.sql" - }, { - "type": "alter", - "name": "Alter Primary Key Constraint -- 11 Plus", - "endpoint": "NODE-primary_key.obj_id", - "sql_endpoint": "NODE-primary_key.sql_id", - "msql_endpoint": "NODE-primary_key.msql_id", - "data": { - "name": "Pk_$%{}[]()&*^!@\"'`\\/#a", - "fillfactor": 90, - "comment": "Comment for alter" - }, - "expected_sql_file": "alter_pkey_constraint.sql", - "expected_msql_file": "alter_pkey_constraint_msql.sql" - }, { - "type": "alter", - "name": "Alter Primary Key Constraint Reset Fill factor", - "endpoint": "NODE-primary_key.obj_id", - "sql_endpoint": "NODE-primary_key.sql_id", - "msql_endpoint": "NODE-primary_key.msql_id", - "data": { - "fillfactor": "" - }, - "expected_sql_file": "alter_pkey_reset_fillfactor.sql", - "expected_msql_file": "alter_pkey_reset_fillfactor_msql.sql" - }, { - "type": "delete", - "name": "Drop Primary Key Constraint -- 11 plus", - "endpoint": "NODE-primary_key.delete_id", - "data": { - "name": "Pk_$%{}[]()&*^!@\"'`\\/#a" - } - }, { - "type": "create", - "name": "Create Primary Key Constraint with Index -- 11 plus", - "endpoint": "NODE-primary_key.obj", - "sql_endpoint": "NODE-primary_key.sql_id", - "msql_endpoint": "NODE-primary_key.msql", - "data": { - "name": "Pk_$%{}[]()&*^!@\"'`\\/#", - "comment": "Comment for create", - "index": "uindex" - }, - "expected_sql_file": "create_pkey_constraint_with_index.sql", - "expected_msql_file": "create_pkey_constraint_with_index_msql.sql" - }, { - "type": "alter", - "name": "Alter Primary Key Constraint with Index -- 11 plus", - "endpoint": "NODE-primary_key.obj_id", - "sql_endpoint": "NODE-primary_key.sql_id", - "msql_endpoint": "NODE-primary_key.msql_id", - "data": { - "name": "Pk_$%{}[]()&*^!@\"'`\\/#a", - "fillfactor": 90, - "comment": "Comment for alter" - }, - "expected_sql_file": "alter_pkey_constraint_with_index.sql", - "expected_msql_file": "alter_pkey_constraint_with_index_msql.sql" - }, { - "type": "delete", - "name": "Drop Primary Key Constraint with Index -- 11 plus", - "endpoint": "NODE-primary_key.delete_id", - "data": { - "name": "Pk_$%{}[]()&*^!@\"'`\\/#a" - } - }, { - "type": "delete", - "name": "Drop Index Constraint Table -- 11 plus", - "endpoint": "NODE-table.delete_id", - "data": { - "name": "tablefor_primary_key_cons" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_unique_constraint.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_unique_constraint.json deleted file mode 100644 index a90e0363514..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/11_plus/test_unique_constraint.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tablefor_unique_cons", - "columns": [{ - "name": "col1", - "cltype": "integer", - "is_primary_key": false - }, { - "name": "col2", - "cltype": "integer", - "is_primary_key": false - }], - "is_partitioned": false, - "schema": "testschema", - "spcname": "pg_default" - }, - "store_object_id": true - }, { - "type": "create", - "name": "Create Index", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "data": { - "name": "uindex", - "spcname": "pg_default", - "amname": "btree", - "columns": [{ - "colname": "col1", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": true - }], - "indisunique": true, - "fillfactor": 20 - } - }, { - "type": "create", - "name": "Create Unique Constraint -- 11 Plus", - "endpoint": "NODE-unique_constraint.obj", - "sql_endpoint": "NODE-unique_constraint.sql_id", - "msql_endpoint": "NODE-unique_constraint.msql", - "data": { - "name": "UC_$%{}[]()&*^!@\"'`\\/#", - "comment": "Comment for create", - "fillfactor": 20, - "columns": [{"column":"col1"}], - "include": ["col2"], - "condeferrable": true, - "condeferred": true - }, - "expected_sql_file": "create_unique_constraint.sql", - "expected_msql_file": "create_unique_constraint_msql.sql" - }, { - "type": "alter", - "name": "Alter Unique Constraint -- 11 Plus", - "endpoint": "NODE-unique_constraint.obj_id", - "sql_endpoint": "NODE-unique_constraint.sql_id", - "msql_endpoint": "NODE-unique_constraint.msql_id", - "data": { - "name": "UC_$%{}[]()&*^!@\"'`\\/#a", - "fillfactor": 90, - "comment": "Comment for alter" - }, - "expected_sql_file": "alter_unique_constraint.sql", - "expected_msql_file": "alter_unique_constraint_msql.sql" - }, { - "type": "alter", - "name": "Alter Unique Constraint Reset Fill factor", - "endpoint": "NODE-unique_constraint.obj_id", - "sql_endpoint": "NODE-unique_constraint.sql_id", - "msql_endpoint": "NODE-unique_constraint.msql_id", - "data": { - "fillfactor": "" - }, - "expected_sql_file": "alter_unique_reset_fillfactor.sql", - "expected_msql_file": "alter_unique_reset_fillfactor_msql.sql" - }, { - "type": "delete", - "name": "Drop Unique Constraint -- 11 Plus", - "endpoint": "NODE-unique_constraint.delete_id", - "data": { - "name": "UC_$%{}[]()&*^!@\"'`\\/#a" - } - }, { - "type": "create", - "name": "Create Unique Constraint with Index -- 11 Plus", - "endpoint": "NODE-unique_constraint.obj", - "sql_endpoint": "NODE-unique_constraint.sql_id", - "msql_endpoint": "NODE-unique_constraint.msql", - "data": { - "name": "UC_$%{}[]()&*^!@\"'`\\/#", - "comment": "Comment for create", - "index": "uindex" - }, - "expected_sql_file": "create_unique_constraint_with_index.sql", - "expected_msql_file": "create_unique_constraint_with_index_msql.sql" - }, { - "type": "alter", - "name": "Alter Unique Constraint with Index -- 11 Plus", - "endpoint": "NODE-unique_constraint.obj_id", - "sql_endpoint": "NODE-unique_constraint.sql_id", - "msql_endpoint": "NODE-unique_constraint.msql_id", - "data": { - "name": "UC_$%{}[]()&*^!@\"'`\\/#a", - "fillfactor": 90, - "comment": "Comment for alter" - }, - "expected_sql_file": "alter_unique_constraint_with_index.sql", - "expected_msql_file": "alter_unique_constraint_with_index_msql.sql" - }, { - "type": "delete", - "name": "Drop Unique Constraint -- 11 Plus", - "endpoint": "NODE-unique_constraint.delete_id", - "data": { - "name": "UC_$%{}[]()&*^!@\"'`\\/#a" - } - }, { - "type": "delete", - "name": "Drop Unique Constraint Table -- 11 Plus", - "endpoint": "NODE-table.delete_id", - "data": { - "name": "tablefor_unique_cons" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_constraint.sql index 5b580c18b47..ee3ad60881e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_constraint.sql @@ -4,6 +4,7 @@ ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" PRIMARY KEY (col1) + INCLUDE (col2) WITH (FILLFACTOR=90) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_reset_fillfactor.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_reset_fillfactor.sql index 6006c403305..a7cf8983f92 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_reset_fillfactor.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_pkey_reset_fillfactor.sql @@ -4,6 +4,7 @@ ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" PRIMARY KEY (col1) + INCLUDE (col2) DEFERRABLE INITIALLY DEFERRED; COMMENT ON CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_primary_key_cons diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_constraint.sql index 59b1eede9c6..bdf4b75dd13 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_constraint.sql @@ -4,6 +4,7 @@ ALTER TABLE IF EXISTS testschema.tablefor_unique_cons ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" UNIQUE (col1) + INCLUDE (col2) WITH (FILLFACTOR=90) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_reset_fillfactor.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_reset_fillfactor.sql index d565b7ede77..446b3727b35 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_reset_fillfactor.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/alter_unique_reset_fillfactor.sql @@ -4,6 +4,7 @@ ALTER TABLE IF EXISTS testschema.tablefor_unique_cons ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" UNIQUE (col1) + INCLUDE (col2) DEFERRABLE INITIALLY DEFERRED; COMMENT ON CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#a" ON testschema.tablefor_unique_cons diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint.sql index 9ea9f9c87f7..15a7a62b9bd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint.sql @@ -4,6 +4,7 @@ ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" PRIMARY KEY (col1) + INCLUDE (col2) WITH (FILLFACTOR=20) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint_msql.sql index 1f66bf74ea6..8fede9bcbc2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_pkey_constraint_msql.sql @@ -1,5 +1,6 @@ ALTER TABLE IF EXISTS testschema.tablefor_primary_key_cons ADD CONSTRAINT "Pk_$%{}[]()&*^!@""'`\/#" PRIMARY KEY (col1) + INCLUDE (col2) WITH (FILLFACTOR=20) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint.sql index 4d939234983..ace1282238c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint.sql @@ -4,6 +4,7 @@ ALTER TABLE IF EXISTS testschema.tablefor_unique_cons ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" UNIQUE (col1) + INCLUDE (col2) WITH (FILLFACTOR=20) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint_msql.sql index 41fd55af7e3..83c4e1804ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/create_unique_constraint_msql.sql @@ -1,5 +1,6 @@ ALTER TABLE IF EXISTS testschema.tablefor_unique_cons ADD CONSTRAINT "UC_$%{}[]()&*^!@""'`\/#" UNIQUE (col1) + INCLUDE (col2) WITH (FILLFACTOR=20) DEFERRABLE INITIALLY DEFERRED; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_primary_key.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_primary_key.json index 2eadf391dae..f231e6581f9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_primary_key.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_primary_key.json @@ -11,6 +11,10 @@ "name": "col1", "cltype": "integer", "is_primary_key": false + }, { + "name": "col2", + "cltype": "integer", + "is_primary_key": false }], "is_partitioned": false, "schema": "testschema", @@ -37,7 +41,7 @@ } }, { "type": "create", - "name": "Create Primary Key Constraint", + "name": "Create Primary Key Constraint -- 11 Plus", "endpoint": "NODE-primary_key.obj", "sql_endpoint": "NODE-primary_key.sql_id", "msql_endpoint": "NODE-primary_key.msql", @@ -46,6 +50,7 @@ "comment": "Comment for create", "fillfactor": 20, "columns": [{"column":"col1"}], + "include": ["col2"], "condeferrable": true, "condeferred": true }, @@ -53,7 +58,7 @@ "expected_msql_file": "create_pkey_constraint_msql.sql" }, { "type": "alter", - "name": "Alter Primary Key Constraint", + "name": "Alter Primary Key Constraint -- 11 Plus", "endpoint": "NODE-primary_key.obj_id", "sql_endpoint": "NODE-primary_key.sql_id", "msql_endpoint": "NODE-primary_key.msql_id", @@ -77,14 +82,14 @@ "expected_msql_file": "alter_pkey_reset_fillfactor_msql.sql" }, { "type": "delete", - "name": "Drop Primary Key Constraint", + "name": "Drop Primary Key Constraint -- 11 plus", "endpoint": "NODE-primary_key.delete_id", "data": { "name": "Pk_$%{}[]()&*^!@\"'`\\/#a" } }, { "type": "create", - "name": "Create Primary Key Constraint with Index", + "name": "Create Primary Key Constraint with Index -- 11 plus", "endpoint": "NODE-primary_key.obj", "sql_endpoint": "NODE-primary_key.sql_id", "msql_endpoint": "NODE-primary_key.msql", @@ -97,7 +102,7 @@ "expected_msql_file": "create_pkey_constraint_with_index_msql.sql" }, { "type": "alter", - "name": "Alter Primary Key Constraint with Index", + "name": "Alter Primary Key Constraint with Index -- 11 plus", "endpoint": "NODE-primary_key.obj_id", "sql_endpoint": "NODE-primary_key.sql_id", "msql_endpoint": "NODE-primary_key.msql_id", @@ -110,21 +115,14 @@ "expected_msql_file": "alter_pkey_constraint_with_index_msql.sql" }, { "type": "delete", - "name": "Drop Primary Key Constraint with Index", + "name": "Drop Primary Key Constraint with Index -- 11 plus", "endpoint": "NODE-primary_key.delete_id", "data": { "name": "Pk_$%{}[]()&*^!@\"'`\\/#a" } }, { "type": "delete", - "name": "Drop Index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "uindex" - } - }, { - "type": "delete", - "name": "Drop Index Constraint Table", + "name": "Drop Index Constraint Table -- 11 plus", "endpoint": "NODE-table.delete_id", "data": { "name": "tablefor_primary_key_cons" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_unique_constraint.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_unique_constraint.json index 068d47bf7ba..a90e0363514 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_unique_constraint.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/tests/default/test_unique_constraint.json @@ -11,6 +11,10 @@ "name": "col1", "cltype": "integer", "is_primary_key": false + }, { + "name": "col2", + "cltype": "integer", + "is_primary_key": false }], "is_partitioned": false, "schema": "testschema", @@ -37,7 +41,7 @@ } }, { "type": "create", - "name": "Create Unique Constraint", + "name": "Create Unique Constraint -- 11 Plus", "endpoint": "NODE-unique_constraint.obj", "sql_endpoint": "NODE-unique_constraint.sql_id", "msql_endpoint": "NODE-unique_constraint.msql", @@ -46,6 +50,7 @@ "comment": "Comment for create", "fillfactor": 20, "columns": [{"column":"col1"}], + "include": ["col2"], "condeferrable": true, "condeferred": true }, @@ -53,7 +58,7 @@ "expected_msql_file": "create_unique_constraint_msql.sql" }, { "type": "alter", - "name": "Alter Unique Constraint", + "name": "Alter Unique Constraint -- 11 Plus", "endpoint": "NODE-unique_constraint.obj_id", "sql_endpoint": "NODE-unique_constraint.sql_id", "msql_endpoint": "NODE-unique_constraint.msql_id", @@ -77,14 +82,14 @@ "expected_msql_file": "alter_unique_reset_fillfactor_msql.sql" }, { "type": "delete", - "name": "Drop Unique Constraint", + "name": "Drop Unique Constraint -- 11 Plus", "endpoint": "NODE-unique_constraint.delete_id", "data": { "name": "UC_$%{}[]()&*^!@\"'`\\/#a" } }, { "type": "create", - "name": "Create Unique Constraint with Index", + "name": "Create Unique Constraint with Index -- 11 Plus", "endpoint": "NODE-unique_constraint.obj", "sql_endpoint": "NODE-unique_constraint.sql_id", "msql_endpoint": "NODE-unique_constraint.msql", @@ -97,7 +102,7 @@ "expected_msql_file": "create_unique_constraint_with_index_msql.sql" }, { "type": "alter", - "name": "Alter Unique Constraint with Index", + "name": "Alter Unique Constraint with Index -- 11 Plus", "endpoint": "NODE-unique_constraint.obj_id", "sql_endpoint": "NODE-unique_constraint.sql_id", "msql_endpoint": "NODE-unique_constraint.msql_id", @@ -110,21 +115,14 @@ "expected_msql_file": "alter_unique_constraint_with_index_msql.sql" }, { "type": "delete", - "name": "Drop Unique Constraint", + "name": "Drop Unique Constraint -- 11 Plus", "endpoint": "NODE-unique_constraint.delete_id", "data": { "name": "UC_$%{}[]()&*^!@\"'`\\/#a" } }, { "type": "delete", - "name": "Drop Index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "uindex" - } - }, { - "type": "delete", - "name": "Drop Unique Constraint Table", + "name": "Drop Unique Constraint Table -- 11 Plus", "endpoint": "NODE-table.delete_id", "data": { "name": "tablefor_unique_cons" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_expr_statistics.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_expr_statistics.sql deleted file mode 100644 index f7c25eae1f2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_expr_statistics.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx3_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx3_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx3_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, lower(name) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx3_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_name_fillfactor_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_name_fillfactor_comment.sql deleted file mode 100644 index 89a4e57b2ce..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_name_fillfactor_comment.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Index: Idx1_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx1_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.test_table_for_indexes - CLUSTER ON "Idx1_$%{}[]()&*^!@""'`\/#"; - -COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_reset_fillfactor_cluster.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_reset_fillfactor_cluster.sql deleted file mode 100644 index d8c7cd5c5a3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_reset_fillfactor_cluster.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Index: Idx1_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx1_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - TABLESPACE pg_default; - -COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first.sql deleted file mode 100644 index 4b2dab72fe2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first_msql.sql deleted file mode 100644 index 26260514194..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last.sql deleted file mode 100644 index 7d49e7c5fa8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last_msql.sql deleted file mode 100644 index 7b00025c24a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_last_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first.sql deleted file mode 100644 index edbf94695cc..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first.sql +++ /dev/null @@ -1,10 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=90) - TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first_msql.sql deleted file mode 100644 index 7492543e267..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_first_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last.sql deleted file mode 100644 index 1aed1dd4a47..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last_msql.sql deleted file mode 100644 index c72fd51c634..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_desc_null_last_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last.sql deleted file mode 100644 index f7c25eae1f2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx3_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx3_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx3_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, lower(name) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx3_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last_msql.sql deleted file mode 100644 index ada43a67b06..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_expr_asc_null_last_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx3_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, (lower(name)) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx3_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/test_indexes.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/test_indexes.json deleted file mode 100644 index 12182d16a14..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/test_indexes.json +++ /dev/null @@ -1,364 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for indexes", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_table_for_indexes", - "columns": [{ - "name": "id", - "cltype": "bigint", - "is_primary_key": true - }, { - "name": "name", - "cltype": "text" - }], - "is_partitioned": false, - "spcname": "pg_default", - "schema": "public" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create btree index with ASC and NULLS LAST -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_asc_null_last.sql", - "expected_msql_file": "create_btree_asc_null_last_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 11 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with ASC and NULLS FIRST -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":true, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":true, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_asc_null_first.sql", - "expected_msql_file": "create_btree_asc_null_first_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 11 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with DESC and NULLS LAST -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":true, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":true, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_desc_null_last.sql", - "expected_msql_file": "create_btree_desc_null_last_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 11 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with DESC and NULLS FIRST -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":true, - "nulls":true, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":true, - "nulls":true, - "is_sort_nulls_applicable":true - }], - "indisunique":true, - "indisclustered":false, - "isconcurrent":false - }, - "expected_sql_file": "create_btree_desc_null_first.sql", - "expected_msql_file": "create_btree_desc_null_first_msql.sql" - }, - { - "type": "alter", - "name": "Alter index name, fill factor, comment and clustered -- 11 Plus", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "name": "Idx1_$%{}[]()&*^!@\"'`\\/#", - "description":"Test Comment", - "fillfactor":"10", - "indisclustered":true - }, - "expected_sql_file": "alter_name_fillfactor_comment.sql", - "expected_msql_file": "alter_name_fillfactor_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter reset fill factor and cluster -- 11 Plus", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "fillfactor": "", - "indisclustered": false - }, - "expected_sql_file": "alter_reset_fillfactor_cluster.sql", - "expected_msql_file": "alter_reset_fillfactor_cluster_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 11 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with expression and ASC and NULLS LAST -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx3_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "is_exp": true, - "colname":"lower(name)", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_expr_asc_null_last.sql", - "expected_msql_file": "create_btree_expr_asc_null_last_msql.sql" - }, - { - "type": "alter", - "name": "Alter index statistics of expression -- 11 Plus", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "name": "Idx3_$%{}[]()&*^!@\"'`\\/#", - "columns":{ - "changed": [{ - "is_exp": true, - "col_num": 2, - "colname":"lower(name)", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true, - "statistics": 1000 - }] - } - }, - "expected_sql_file": "alter_expr_statistics.sql", - "expected_msql_file": "alter_expr_statistics_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 11 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create hash index -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname": "pg_default", - "amname": "hash", - "columns": [{ - "colname": "id", - "collspcname": "", - "op_class": "", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": false - }], - "indisunique": false, - "indisclustered": false, - "isconcurrent": false - }, - "expected_sql_file": "create_hash_index.sql", - "expected_msql_file": "create_hash_index_msql.sql" - }, - { - "type": "delete", - "name": "Drop hash index -- 11 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "delete", - "name": "Drop Table", - "endpoint": "NODE-table.delete_id", - "data": { - "name": "test_table_for_indexes" - } - }, - { - "type": "create", - "name": "Create unnamed hash index -- 11 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "spcname": "pg_default", - "amname": "hash", - "columns": [{ - "colname": "id", - "collspcname": "", - "op_class": "", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": false - }], - "indisunique": false, - "isconcurrent": false - }, - "expected_msql_file": "create_unnamed_hash_index_msql.sql" - }, - { - "type": "delete", - "name": "Drop hash index -- 11 Plus", - "endpoint": "NODE-index.delete_id" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_expr_statistics.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_expr_statistics.sql deleted file mode 100644 index f7c25eae1f2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_expr_statistics.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx3_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx3_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx3_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, lower(name) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx3_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_name_fillfactor_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_name_fillfactor_comment.sql deleted file mode 100644 index b25e51fe7e9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_name_fillfactor_comment.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Index: Idx1_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx1_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.test_table_for_indexes - CLUSTER ON "Idx1_$%{}[]()&*^!@""'`\/#"; -COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_reset_fillfactor_cluster.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_reset_fillfactor_cluster.sql deleted file mode 100644 index d8c7cd5c5a3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_reset_fillfactor_cluster.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Index: Idx1_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx1_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - TABLESPACE pg_default; - -COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first.sql deleted file mode 100644 index 7a707969d2e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=10, deduplicate_items=False) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first_msql.sql deleted file mode 100644 index a1547386a2b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_first_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) - INCLUDE(name, id) - WITH (fillfactor=10, deduplicate_items=False) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last.sql deleted file mode 100644 index b4b7b6ec757..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10, deduplicate_items=False) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last_msql.sql deleted file mode 100644 index 210314f3388..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_asc_null_last_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10, deduplicate_items=False) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_first.sql deleted file mode 100644 index d7f87ff1081..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_first.sql +++ /dev/null @@ -1,9 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) - INCLUDE(name, id) - TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last.sql deleted file mode 100644 index f0faed97b8f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10, deduplicate_items=False) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last_msql.sql deleted file mode 100644 index 61e5e8f1650..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_last_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10, deduplicate_items=False) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_expr_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_expr_asc_null_last.sql deleted file mode 100644 index f7c25eae1f2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_expr_asc_null_last.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Index: Idx3_$%{}[]()&*^!@"'`\/# - --- DROP INDEX IF EXISTS public."Idx3_$%{}[]()&*^!@""'`\/#"; - -CREATE UNIQUE INDEX IF NOT EXISTS "Idx3_$%{}[]()&*^!@""'`\/#" - ON public.test_table_for_indexes USING btree - (id ASC NULLS LAST, lower(name) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - INCLUDE(name, id) - WITH (fillfactor=10) - TABLESPACE pg_default - WHERE id < 100; - -COMMENT ON INDEX public."Idx3_$%{}[]()&*^!@""'`\/#" - IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/test_indexes.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/test_indexes.json deleted file mode 100644 index 3a66cbfe03a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/test_indexes.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table for indexes", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_table_for_indexes", - "columns": [{ - "name": "id", - "cltype": "bigint", - "is_primary_key": true - }, { - "name": "name", - "cltype": "text" - }], - "is_partitioned": false, - "spcname": "pg_default", - "schema": "public" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create btree index with extensions.", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "deduplicate_items": false, - "indisunique":true, - "indnullsnotdistinct":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100", - "dependsonextensions": ["plpgsql", "postgres_fdw"] - }, - "expected_sql_file": "create_index_with_ext.sql", - "expected_msql_file": "create_index_with_ext.msql" - }, - { - "type": "alter", - "name": "Alter index with NO DEPENDS ON", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#", - "dependsonextensions": ["plpgsql"] - }, - "expected_sql_file": "alter_index_no_depends.sql", - "expected_msql_file": "alter_index_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [""] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create btree index with ASC and NULLS LAST -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "deduplicate_items": false, - "indisunique":true, - "indnullsnotdistinct":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_asc_null_last.sql", - "expected_msql_file": "create_btree_asc_null_last_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with ASC and NULLS FIRST -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":true, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":true, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "deduplicate_items": false, - "indisunique":true, - "indnullsnotdistinct":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_asc_null_first.sql", - "expected_msql_file": "create_btree_asc_null_first_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with DESC and NULLS LAST -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":true, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":true, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "deduplicate_items":false, - "indisunique":true, - "indnullsnotdistinct":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_desc_null_last.sql", - "expected_msql_file": "create_btree_desc_null_last_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with DESC and NULLS FIRST -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":true, - "nulls":true, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":true, - "nulls":true, - "is_sort_nulls_applicable":true - }], - "indisunique":true, - "indnullsnotdistinct":true, - "indisclustered":false, - "isconcurrent":false - }, - "expected_sql_file": "create_btree_desc_null_first.sql", - "expected_msql_file": "create_btree_desc_null_first_msql.sql" - }, - { - "type": "alter", - "name": "Alter index name, fill factor, comment and clustered -- 13 Plus", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "name": "Idx1_$%{}[]()&*^!@\"'`\\/#", - "description":"Test Comment", - "fillfactor":"10", - "indisclustered":true - }, - "expected_sql_file": "alter_name_fillfactor_comment.sql", - "expected_msql_file": "alter_name_fillfactor_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter reset fill factor and cluster -- 13 Plus", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "fillfactor": "", - "indisclustered": false - }, - "expected_sql_file": "alter_reset_fillfactor_cluster.sql", - "expected_msql_file": "alter_reset_fillfactor_cluster_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with expression and ASC and NULLS LAST -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx3_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "include": ["name", "id"], - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "is_exp": true, - "colname":"lower(name)", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" - }, - "expected_sql_file": "create_btree_expr_asc_null_last.sql", - "expected_msql_file": "create_btree_expr_asc_null_last_msql.sql" - }, - { - "type": "alter", - "name": "Alter index statistics of expression -- 13 Plus", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "name": "Idx3_$%{}[]()&*^!@\"'`\\/#", - "columns":{ - "changed": [{ - "is_exp": true, - "col_num": 2, - "colname":"lower(name)", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true, - "statistics": 1000 - }] - } - }, - "expected_sql_file": "alter_expr_statistics.sql", - "expected_msql_file": "alter_expr_statistics_msql.sql" - }, - { - "type": "delete", - "name": "Drop index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create hash index -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname": "pg_default", - "amname": "hash", - "columns": [{ - "colname": "id", - "collspcname": "", - "op_class": "", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": false - }], - "indisunique": false, - "indisclustered": false, - "isconcurrent": false - }, - "expected_sql_file": "create_hash_index.sql", - "expected_msql_file": "create_hash_index_msql.sql" - }, - { - "type": "delete", - "name": "Drop hash index -- 13 Plus", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "delete", - "name": "Drop Table", - "endpoint": "NODE-table.delete_id", - "data": { - "name": "test_table_for_indexes" - } - }, - { - "type": "create", - "name": "Create unnamed hash index -- 13 Plus", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "spcname": "pg_default", - "amname": "hash", - "columns": [{ - "colname": "id", - "collspcname": "", - "op_class": "", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": false - }], - "indisunique": false, - "isconcurrent": false - }, - "expected_msql_file": "create_unnamed_hash_index_msql.sql" - }, - { - "type": "delete", - "name": "Drop hash index -- 13 Plus", - "endpoint": "NODE-index.delete_id" - } - ] - } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_expr_statistics.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_expr_statistics.sql index 51c1afec95b..f7c25eae1f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_expr_statistics.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_expr_statistics.sql @@ -5,6 +5,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx3_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS LAST, lower(name) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) + INCLUDE(name, id) WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_expr_statistics_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_expr_statistics_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/alter_expr_statistics_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_expr_statistics_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_index_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_index_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_index_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_index_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_index_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_index_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_index_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_index_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_name_fillfactor_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_name_fillfactor_comment.sql index 5b3809ce35b..b25e51fe7e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_name_fillfactor_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_name_fillfactor_comment.sql @@ -5,11 +5,11 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) + INCLUDE(name, id) WITH (fillfactor=10) TABLESPACE pg_default; ALTER TABLE IF EXISTS public.test_table_for_indexes CLUSTER ON "Idx1_$%{}[]()&*^!@""'`\/#"; - COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" IS 'Test Comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_reset_fillfactor_cluster.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_reset_fillfactor_cluster.sql index 1c559ed538c..d8c7cd5c5a3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_reset_fillfactor_cluster.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/alter_reset_fillfactor_cluster.sql @@ -5,6 +5,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) + INCLUDE(name, id) TABLESPACE pg_default; COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first.sql index 80ded9e1560..7a707969d2e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first.sql @@ -5,7 +5,8 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) - WITH (fillfactor=10, deduplicate_items=True) + INCLUDE(name, id) + WITH (fillfactor=10, deduplicate_items=False) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first_msql.sql index 55cb54d3647..a1547386a2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_first_msql.sql @@ -1,7 +1,8 @@ CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) - WITH (fillfactor=10, deduplicate_items=True) + INCLUDE(name, id) + WITH (fillfactor=10, deduplicate_items=False) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last.sql index 3960455dbab..b4b7b6ec757 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last.sql @@ -5,7 +5,8 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - WITH (fillfactor=10) + INCLUDE(name, id) + WITH (fillfactor=10, deduplicate_items=False) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last_msql.sql index 287556bafac..210314f3388 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_asc_null_last_msql.sql @@ -1,7 +1,8 @@ CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - WITH (fillfactor=10) + INCLUDE(name, id) + WITH (fillfactor=10, deduplicate_items=False) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first.sql index 78fb0a1f101..d7f87ff1081 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first.sql @@ -5,4 +5,5 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) + INCLUDE(name, id) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first_msql.sql index f7db5ea7e8f..7492543e267 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_first_msql.sql @@ -1,4 +1,5 @@ CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) + INCLUDE(name, id) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last.sql index 90766406404..f0faed97b8f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last.sql @@ -5,7 +5,8 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) - WITH (fillfactor=10) + INCLUDE(name, id) + WITH (fillfactor=10, deduplicate_items=False) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last_msql.sql index dfb1a18b7a4..61e5e8f1650 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last_msql.sql @@ -1,7 +1,8 @@ CREATE UNIQUE INDEX "Idx_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) - WITH (fillfactor=10, deduplicate_items=True) + INCLUDE(name, id) + WITH (fillfactor=10, deduplicate_items=False) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last.sql index d85d42c14b2..f7c25eae1f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last.sql @@ -5,7 +5,8 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx3_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS LAST, lower(name) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) - WITH (fillfactor=10, deduplicate_items=True) + INCLUDE(name, id) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last_msql.sql index 53c401357a6..ada43a67b06 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_expr_asc_null_last_msql.sql @@ -1,6 +1,7 @@ CREATE UNIQUE INDEX "Idx3_$%{}[]()&*^!@""'`\/#" ON public.test_table_for_indexes USING btree (id ASC NULLS LAST, (lower(name)) COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) + INCLUDE(name, id) WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_index_with_ext.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_index_with_ext.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_index_with_ext.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_index_with_ext.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_index_with_ext.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_index_with_ext.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_index_with_ext.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_index_with_ext.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/test_indexes.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/test_indexes.json index e1b81690d03..3a66cbfe03a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/test_indexes.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/test_indexes.json @@ -1,158 +1,318 @@ { - "scenarios": [ - { - "type": "create", - "name": "Create Table for indexes", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_table_for_indexes", - "columns": [{ - "name": "id", - "cltype": "bigint", - "is_primary_key": true - }, { - "name": "name", - "cltype": "text" - }], - "is_partitioned": false, - "spcname": "pg_default", - "schema": "public" + "scenarios": [ + { + "type": "create", + "name": "Create Extension", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "postgres_fdw", + "version": "", + "relocatable": true + }, + "store_object_id": true }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create btree index with ASC and NULLS LAST", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" + { + "type": "create", + "name": "Create Table for indexes", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "data": { + "name": "test_table_for_indexes", + "columns": [{ + "name": "id", + "cltype": "bigint", + "is_primary_key": true + }, { + "name": "name", + "cltype": "text" + }], + "is_partitioned": false, + "spcname": "pg_default", + "schema": "public" + }, + "store_object_id": true }, - "expected_sql_file": "create_btree_asc_null_last.sql", - "expected_msql_file": "create_btree_asc_null_last_msql.sql" - }, - { - "type": "delete", - "name": "Drop index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with ASC and NULLS FIRST", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":false, - "nulls":true, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":false, - "nulls":true, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" + { + "type": "create", + "name": "Create btree index with extensions.", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "name":"Idx_$%{}[]()&*^!@\"'`\\/#", + "spcname":"pg_default", + "amname":"btree", + "include": ["name", "id"], + "columns":[{ + "colname":"id", + "collspcname":"", + "op_class":"", + "sort_order":false, + "nulls":false, + "is_sort_nulls_applicable":true + }, { + "colname":"name", + "collspcname":"pg_catalog.\"POSIX\"", + "op_class":"text_pattern_ops", + "sort_order":false, + "nulls":false, + "is_sort_nulls_applicable":true + }], + "description":"Test Comment", + "fillfactor":"10", + "deduplicate_items": false, + "indisunique":true, + "indnullsnotdistinct":true, + "indisclustered":false, + "isconcurrent":false, + "indconstraint":"id < 100", + "dependsonextensions": ["plpgsql", "postgres_fdw"] + }, + "expected_sql_file": "create_index_with_ext.sql", + "expected_msql_file": "create_index_with_ext.msql" }, - "expected_sql_file": "create_btree_asc_null_first.sql", - "expected_msql_file": "create_btree_asc_null_first_msql.sql" - }, - { - "type": "delete", - "name": "Drop index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with DESC and NULLS LAST", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":true, - "nulls":false, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":true, - "nulls":false, - "is_sort_nulls_applicable":true - }], - "description":"Test Comment", - "fillfactor":"10", - "indisunique":true, - "indisclustered":false, - "isconcurrent":false, - "indconstraint":"id < 100" + { + "type": "alter", + "name": "Alter index with NO DEPENDS ON", + "endpoint": "NODE-index.obj_id", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql_id", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#", + "dependsonextensions": ["plpgsql"] + }, + "expected_sql_file": "alter_index_no_depends.sql", + "expected_msql_file": "alter_index_no_depends.msql" }, - "expected_sql_file": "create_btree_desc_null_last.sql", - "expected_msql_file": "create_btree_desc_null_last_msql.sql" - }, - { - "type": "delete", - "name": "Drop index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { + { + "type": "delete", + "name": "Drop index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "delete", + "name": "Drop Extension", + "endpoint": "NODE-extension.delete", + "data": { + "ids": [""] + }, + "preprocess_data": true + }, + { + "type": "create", + "name": "Create btree index with ASC and NULLS LAST -- 13 Plus", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "name":"Idx_$%{}[]()&*^!@\"'`\\/#", + "spcname":"pg_default", + "amname":"btree", + "include": ["name", "id"], + "columns":[{ + "colname":"id", + "collspcname":"", + "op_class":"", + "sort_order":false, + "nulls":false, + "is_sort_nulls_applicable":true + }, { + "colname":"name", + "collspcname":"pg_catalog.\"POSIX\"", + "op_class":"text_pattern_ops", + "sort_order":false, + "nulls":false, + "is_sort_nulls_applicable":true + }], + "description":"Test Comment", + "fillfactor":"10", + "deduplicate_items": false, + "indisunique":true, + "indnullsnotdistinct":true, + "indisclustered":false, + "isconcurrent":false, + "indconstraint":"id < 100" + }, + "expected_sql_file": "create_btree_asc_null_last.sql", + "expected_msql_file": "create_btree_asc_null_last_msql.sql" + }, + { + "type": "delete", + "name": "Drop index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create btree index with ASC and NULLS FIRST -- 13 Plus", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "name":"Idx_$%{}[]()&*^!@\"'`\\/#", + "spcname":"pg_default", + "amname":"btree", + "include": ["name", "id"], + "columns":[{ + "colname":"id", + "collspcname":"", + "op_class":"", + "sort_order":false, + "nulls":true, + "is_sort_nulls_applicable":true + }, { + "colname":"name", + "collspcname":"pg_catalog.\"POSIX\"", + "op_class":"text_pattern_ops", + "sort_order":false, + "nulls":true, + "is_sort_nulls_applicable":true + }], + "description":"Test Comment", + "fillfactor":"10", + "deduplicate_items": false, + "indisunique":true, + "indnullsnotdistinct":true, + "indisclustered":false, + "isconcurrent":false, + "indconstraint":"id < 100" + }, + "expected_sql_file": "create_btree_asc_null_first.sql", + "expected_msql_file": "create_btree_asc_null_first_msql.sql" + }, + { + "type": "delete", + "name": "Drop index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create btree index with DESC and NULLS LAST -- 13 Plus", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "name":"Idx_$%{}[]()&*^!@\"'`\\/#", + "spcname":"pg_default", + "amname":"btree", + "include": ["name", "id"], + "columns":[{ + "colname":"id", + "collspcname":"", + "op_class":"", + "sort_order":true, + "nulls":false, + "is_sort_nulls_applicable":true + }, { + "colname":"name", + "collspcname":"pg_catalog.\"POSIX\"", + "op_class":"text_pattern_ops", + "sort_order":true, + "nulls":false, + "is_sort_nulls_applicable":true + }], + "description":"Test Comment", + "fillfactor":"10", + "deduplicate_items":false, + "indisunique":true, + "indnullsnotdistinct":true, + "indisclustered":false, + "isconcurrent":false, + "indconstraint":"id < 100" + }, + "expected_sql_file": "create_btree_desc_null_last.sql", + "expected_msql_file": "create_btree_desc_null_last_msql.sql" + }, + { + "type": "delete", + "name": "Drop index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create btree index with DESC and NULLS FIRST -- 13 Plus", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "name":"Idx_$%{}[]()&*^!@\"'`\\/#", + "spcname":"pg_default", + "amname":"btree", + "include": ["name", "id"], + "columns":[{ + "colname":"id", + "collspcname":"", + "op_class":"", + "sort_order":true, + "nulls":true, + "is_sort_nulls_applicable":true + }, { + "colname":"name", + "collspcname":"pg_catalog.\"POSIX\"", + "op_class":"text_pattern_ops", + "sort_order":true, + "nulls":true, + "is_sort_nulls_applicable":true + }], + "indisunique":true, + "indnullsnotdistinct":true, + "indisclustered":false, + "isconcurrent":false + }, + "expected_sql_file": "create_btree_desc_null_first.sql", + "expected_msql_file": "create_btree_desc_null_first_msql.sql" + }, + { + "type": "alter", + "name": "Alter index name, fill factor, comment and clustered -- 13 Plus", + "endpoint": "NODE-index.obj_id", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql_id", + "data": { + "name": "Idx1_$%{}[]()&*^!@\"'`\\/#", + "description":"Test Comment", + "fillfactor":"10", + "indisclustered":true + }, + "expected_sql_file": "alter_name_fillfactor_comment.sql", + "expected_msql_file": "alter_name_fillfactor_comment_msql.sql" + }, + { + "type": "alter", + "name": "Alter reset fill factor and cluster -- 13 Plus", + "endpoint": "NODE-index.obj_id", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql_id", + "data": { + "fillfactor": "", + "indisclustered": false + }, + "expected_sql_file": "alter_reset_fillfactor_cluster.sql", + "expected_msql_file": "alter_reset_fillfactor_cluster_msql.sql" + }, + { + "type": "delete", + "name": "Drop index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx1_$%{}[]()&*^!@\"'`\\/#" + } + }, + { "type": "create", - "name": "Create btree index with expression and ASC and NULLS LAST", + "name": "Create btree index with expression and ASC and NULLS LAST -- 13 Plus", "endpoint": "NODE-index.obj", "sql_endpoint": "NODE-index.sql_id", "msql_endpoint": "NODE-index.msql", @@ -160,6 +320,7 @@ "name":"Idx3_$%{}[]()&*^!@\"'`\\/#", "spcname":"pg_default", "amname":"btree", + "include": ["name", "id"], "columns":[{ "colname":"id", "collspcname":"", @@ -186,149 +347,106 @@ "expected_sql_file": "create_btree_expr_asc_null_last.sql", "expected_msql_file": "create_btree_expr_asc_null_last_msql.sql" }, - { - "type": "delete", - "name": "Drop index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx3_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create btree index with DESC and NULLS FIRST", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name":"Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname":"pg_default", - "amname":"btree", - "columns":[{ - "colname":"id", - "collspcname":"", - "op_class":"", - "sort_order":true, - "nulls":true, - "is_sort_nulls_applicable":true - }, { - "colname":"name", - "collspcname":"pg_catalog.\"POSIX\"", - "op_class":"text_pattern_ops", - "sort_order":true, - "nulls":true, - "is_sort_nulls_applicable":true - }], - "indisunique":true, - "indisclustered":false, - "isconcurrent":false + { + "type": "alter", + "name": "Alter index statistics of expression -- 13 Plus", + "endpoint": "NODE-index.obj_id", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql_id", + "data": { + "name": "Idx3_$%{}[]()&*^!@\"'`\\/#", + "columns":{ + "changed": [{ + "is_exp": true, + "col_num": 2, + "colname":"lower(name)", + "collspcname":"pg_catalog.\"POSIX\"", + "op_class":"text_pattern_ops", + "sort_order":false, + "nulls":false, + "is_sort_nulls_applicable":true, + "statistics": 1000 + }] + } + }, + "expected_sql_file": "alter_expr_statistics.sql", + "expected_msql_file": "alter_expr_statistics_msql.sql" }, - "expected_sql_file": "create_btree_desc_null_first.sql", - "expected_msql_file": "create_btree_desc_null_first_msql.sql" - }, - { - "type": "alter", - "name": "Alter index name, fill factor, comment and clustered", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "name": "Idx1_$%{}[]()&*^!@\"'`\\/#", - "description":"Test Comment", - "fillfactor":"10", - "indisclustered":true + { + "type": "delete", + "name": "Drop index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx3_$%{}[]()&*^!@\"'`\\/#" + } }, - "expected_sql_file": "alter_name_fillfactor_comment.sql", - "expected_msql_file": "alter_name_fillfactor_comment_msql.sql" - }, - { - "type": "alter", - "name": "Alter reset fill factor and cluster", - "endpoint": "NODE-index.obj_id", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql_id", - "data": { - "fillfactor": "", - "indisclustered": false + { + "type": "create", + "name": "Create hash index -- 13 Plus", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#", + "spcname": "pg_default", + "amname": "hash", + "columns": [{ + "colname": "id", + "collspcname": "", + "op_class": "", + "sort_order": false, + "nulls": false, + "is_sort_nulls_applicable": false + }], + "indisunique": false, + "indisclustered": false, + "isconcurrent": false + }, + "expected_sql_file": "create_hash_index.sql", + "expected_msql_file": "create_hash_index_msql.sql" }, - "expected_sql_file": "alter_reset_fillfactor_cluster.sql", - "expected_msql_file": "alter_reset_fillfactor_cluster_msql.sql" - }, - { - "type": "delete", - "name": "Drop index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx1_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create hash index", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#", - "spcname": "pg_default", - "amname": "hash", - "columns": [{ - "colname": "id", - "collspcname": "", - "op_class": "", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": false - }], - "indisunique": false, - "indisclustered": false, - "isconcurrent": false + { + "type": "delete", + "name": "Drop hash index -- 13 Plus", + "endpoint": "NODE-index.delete_id", + "data": { + "name": "Idx_$%{}[]()&*^!@\"'`\\/#" + } }, - "expected_sql_file": "create_hash_index.sql", - "expected_msql_file": "create_hash_index_msql.sql" - }, - { - "type": "delete", - "name": "Drop hash index", - "endpoint": "NODE-index.delete_id", - "data": { - "name": "Idx_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "delete", - "name": "Drop Table", - "endpoint": "NODE-table.delete_id", - "data": { - "name": "test_table_for_indexes" - } - }, - { - "type": "create", - "name": "Create unnamed hash index", - "endpoint": "NODE-index.obj", - "sql_endpoint": "NODE-index.sql_id", - "msql_endpoint": "NODE-index.msql", - "data": { - "spcname": "pg_default", - "amname": "hash", - "columns": [{ - "colname": "id", - "collspcname": "", - "op_class": "", - "sort_order": false, - "nulls": false, - "is_sort_nulls_applicable": false - }], - "indisunique": false, - "isconcurrent": false + { + "type": "delete", + "name": "Drop Table", + "endpoint": "NODE-table.delete_id", + "data": { + "name": "test_table_for_indexes" + } }, - "expected_msql_file": "create_unnamed_hash_index_msql.sql" - }, - { - "type": "delete", - "name": "Drop hash index", - "endpoint": "NODE-index.delete_id" - } - ] -} + { + "type": "create", + "name": "Create unnamed hash index -- 13 Plus", + "endpoint": "NODE-index.obj", + "sql_endpoint": "NODE-index.sql_id", + "msql_endpoint": "NODE-index.msql", + "data": { + "spcname": "pg_default", + "amname": "hash", + "columns": [{ + "colname": "id", + "collspcname": "", + "op_class": "", + "sort_order": false, + "nulls": false, + "is_sort_nulls_applicable": false + }], + "indisunique": false, + "isconcurrent": false + }, + "expected_msql_file": "create_unnamed_hash_index_msql.sql" + }, + { + "type": "delete", + "name": "Drop hash index -- 13 Plus", + "endpoint": "NODE-index.delete_id" + } + ] + } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition.sql deleted file mode 100644 index ebe27cc92cd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Table: public.test_table_$%{}[]()&*^!@""'`\/# - --- DROP TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" -( - m_col bigint -) PARTITION BY RANGE (m_col); - -ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" - IS 'comment_01'; - --- Partitions SQL - -CREATE TABLE public."test_part_$%{}[]()&*^!@""""""""'`\/#" PARTITION OF public."test_table_$%{}[]()&*^!@""""'`\/#" - FOR VALUES FROM ('0') TO ('1000') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."test_part_$%{}[]()&*^!@""""""""'`\/#" - OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition_msql.sql deleted file mode 100644 index 30c1610f527..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/alter_table_add_partition_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE TABLE public."test_part_$%{}[]()&*^!@""""""""'`\/#" PARTITION OF public."test_table_$%{}[]()&*^!@""""'`\/#" - FOR VALUES FROM (0) TO (1000); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition.sql deleted file mode 100644 index 10fef1222fa..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Table: public.test_table_$%{}[]()&*^!@""'`\/# - --- DROP TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" -( - m_col bigint -) PARTITION BY RANGE (m_col); - -ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" - IS 'comment_01'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition_msql.sql deleted file mode 100644 index 1d407e3f689..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/create_table_with_partition_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" -( - m_col bigint -) PARTITION BY RANGE (m_col); - -ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" - IS 'comment_01'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/test_partitions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/test_partitions.json deleted file mode 100644 index b740a3ea1ac..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/12_plus/test_partitions.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "test_table_$%{}[]()&*^!@\"\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "comment_01", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "m_col", - "cltype": "bigint", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "m_col" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "alter", - "name": "Alert Table - Add Partition", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "partitions": { - "added": [ - { - "is_attach": false, - "partition_name": "test_part_$%{}[]()&*^!@\"\"\"\"'`\\/#", - "values_from": "0", - "values_to": "1000", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_partition.sql", - "expected_msql_file": "alter_table_add_partition_msql.sql", - "store_object_id": true - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/alter_table_add_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/alter_table_add_partition.sql index 6252a41e07d..ebe27cc92cd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/alter_table_add_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/alter_table_add_partition.sql @@ -5,11 +5,7 @@ CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" ( m_col bigint -) PARTITION BY RANGE (m_col) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (m_col); ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition.sql index 9b7c48eb501..10fef1222fa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition.sql @@ -5,11 +5,7 @@ CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" ( m_col bigint -) PARTITION BY RANGE (m_col) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (m_col); ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition_msql.sql index ad4aa3de5d8..1d407e3f689 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/pg/default/create_table_with_partition_msql.sql @@ -1,10 +1,7 @@ CREATE TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" ( m_col bigint -) PARTITION BY RANGE (m_col) -WITH ( - OIDS = FALSE -); +) PARTITION BY RANGE (m_col); ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition.sql deleted file mode 100644 index 64a28ffcbbc..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition.sql +++ /dev/null @@ -1,23 +0,0 @@ --- Table: public.test_table_$%{}[]()&*^!@""'`\/# - --- DROP TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" -( - m_col bigint -) PARTITION BY RANGE (m_col); - -ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" - IS 'comment_01'; - --- Partitions SQL - -CREATE TABLE IF NOT EXISTS public."test_part_$%{}[]()&*^!@""""""""'`\/#" PARTITION OF public."test_table_$%{}[]()&*^!@""""'`\/#" - FOR VALUES FROM ('0') TO ('1000') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."test_part_$%{}[]()&*^!@""""""""'`\/#" - OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition_msql.sql deleted file mode 100644 index 4338f605239..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/alter_table_add_partition_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE TABLE IF NOT EXISTS public."test_part_$%{}[]()&*^!@""""""""'`\/#" PARTITION OF public."test_table_$%{}[]()&*^!@""""'`\/#" - FOR VALUES FROM (0) TO (1000); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition.sql deleted file mode 100644 index c59e8fb5e20..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition.sql +++ /dev/null @@ -1,14 +0,0 @@ --- Table: public.test_table_$%{}[]()&*^!@""'`\/# - --- DROP TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" -( - m_col bigint -) PARTITION BY RANGE (m_col); - -ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" - IS 'comment_01'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition_msql.sql deleted file mode 100644 index 0e7a4906b65..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/create_table_with_partition_msql.sql +++ /dev/null @@ -1,10 +0,0 @@ -CREATE TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" -( - m_col bigint -) PARTITION BY RANGE (m_col); - -ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" - IS 'comment_01'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/test_partitions.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/test_partitions.json deleted file mode 100644 index 62afc8480a8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/12_plus/test_partitions.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "test_table_$%{}[]()&*^!@\"\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "comment_01", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "m_col", - "cltype": "bigint", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "m_col" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "alter", - "name": "Alert Table - Add Partition", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "partitions": { - "added": [ - { - "is_attach": false, - "partition_name": "test_part_$%{}[]()&*^!@\"\"\"\"'`\\/#", - "values_from": "0", - "values_to": "1000", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_partition.sql", - "expected_msql_file": "alter_table_add_partition_msql.sql", - "store_object_id": true - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/alter_table_add_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/alter_table_add_partition.sql index d39e5834143..64a28ffcbbc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/alter_table_add_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/alter_table_add_partition.sql @@ -5,11 +5,7 @@ CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" ( m_col bigint -) PARTITION BY RANGE (m_col) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (m_col); ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition.sql index a89d6b7d31e..c59e8fb5e20 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition.sql @@ -5,11 +5,7 @@ CREATE TABLE IF NOT EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" ( m_col bigint -) PARTITION BY RANGE (m_col) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (m_col); ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition_msql.sql index bdd5fcf9b80..0e7a4906b65 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/ppas/default/create_table_with_partition_msql.sql @@ -1,10 +1,7 @@ CREATE TABLE public."test_table_$%{}[]()&*^!@""""'`\/#" ( m_col bigint -) PARTITION BY RANGE (m_col) -WITH ( - OIDS = FALSE -); +) PARTITION BY RANGE (m_col); ALTER TABLE IF EXISTS public."test_table_$%{}[]()&*^!@""""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_select_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_select_policy.sql deleted file mode 100644 index 046f964a17b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_select_policy.sql +++ /dev/null @@ -1,14 +0,0 @@ --- POLICY: test_select_policy_rls_$%{}[]()&*^!@"'`\/# - --- DROP POLICY IF EXISTS "test_select_policy_rls_$%{}[]()&*^!@""'`\/#" ON public.test_rls_policy; - -CREATE POLICY "test_select_policy_rls_$%{}[]()&*^!@""'`\/#" - ON public.test_rls_policy - AS PERMISSIVE - FOR SELECT - TO public - USING ((name = CURRENT_USER)); - -COMMENT ON POLICY "test_select_policy_rls_$%{}[]()&*^!@""'`\/#" - ON public.test_rls_policy - IS 'This is test description'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_simple_insert_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_simple_insert_policy.sql deleted file mode 100644 index 5f0c2705617..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_simple_insert_policy.sql +++ /dev/null @@ -1,10 +0,0 @@ --- POLICY: test_simple_insert_rls_policy_$%{}[]()&*^!@"'`\/# - --- DROP POLICY IF EXISTS "test_simple_insert_rls_policy_$%{}[]()&*^!@""'`\/#" ON public.test_rls_policy; - -CREATE POLICY "test_simple_insert_rls_policy_$%{}[]()&*^!@""'`\/#" - ON public.test_rls_policy - AS PERMISSIVE - FOR INSERT - TO public - WITH CHECK ((CURRENT_USER = name)); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_update_policy_with_check_and_using.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_update_policy_with_check_and_using.sql deleted file mode 100644 index d7d27f80174..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/alter_update_policy_with_check_and_using.sql +++ /dev/null @@ -1,11 +0,0 @@ --- POLICY: test_update_rls_policy_$%{}[]()&*^!@"'`\/# - --- DROP POLICY IF EXISTS "test_update_rls_policy_$%{}[]()&*^!@""'`\/#" ON public.test_rls_policy; - -CREATE POLICY "test_update_rls_policy_$%{}[]()&*^!@""'`\/#" - ON public.test_rls_policy - AS RESTRICTIVE - FOR UPDATE - TO public - USING ((CURRENT_USER = name)) - WITH CHECK ((emp_id <> 0)); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/create_delete_policy_with_using.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/create_delete_policy_with_using.sql deleted file mode 100644 index 3eb581c5f39..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/create_delete_policy_with_using.sql +++ /dev/null @@ -1,10 +0,0 @@ --- POLICY: test_delete_rls_policy_$%{}[]()&*^!@"'`\/# - --- DROP POLICY IF EXISTS "test_delete_rls_policy_$%{}[]()&*^!@""'`\/#" ON public.test_rls_policy; - -CREATE POLICY "test_delete_rls_policy_$%{}[]()&*^!@""'`\/#" - ON public.test_rls_policy - AS RESTRICTIVE - FOR DELETE - TO public - USING ((CURRENT_USER = name)); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/test.json deleted file mode 100644 index 1e393fb50ca..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/12_plus/test.json +++ /dev/null @@ -1,349 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table For RLS policy", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_rls_policy", - "columns": [ - { - "name": "emp_id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - }, - { - "name": "salary", - "cltype": "bigint" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Role to test multiple role for RLS policy", - "endpoint": "NODE-role.obj", - "sql_endpoint": "NODE-role.sql_id", - "data": { - "rolname": "Role_1", - "rolcanlogin": false, - "rolpassword": null, - "rolconnlimit": -1, - "rolsuper": false, - "rolcreaterole": false, - "rolcreatedb": false, - "rolinherit": true, - "rolreplication": false, - "rolmembership": [], - "seclabels": [], - "variables": [] - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Role to test multiple role for RLS policy", - "endpoint": "NODE-role.obj", - "sql_endpoint": "NODE-role.sql_id", - "data": { - "rolname": "role_2", - "rolcanlogin": false, - "rolpassword": null, - "rolconnlimit": -1, - "rolsuper": false, - "rolcreaterole": false, - "rolcreatedb": false, - "rolinherit": true, - "rolreplication": false, - "rolmembership": [], - "seclabels": [], - "variables": [] - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create simple select event RLS policy", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql", - "data": { - "name": "test_select_policy_rls_$%{}[]()&*^!@\"'`\\/#", - "event": "SELECT", - "policyowner": ["public"], - "schema": "public", - "type": "PERMISSIVE", - "description": "This is test description" - }, - "expected_sql_file": "create_select_policy.sql", - "expected_msql_file": "create_select_policy_msql.sql" - }, - { - "type": "alter", - "name": "Alter simple select event RLS policy with using clause", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "name": "test_select_policy_rls_$%{}[]()&*^!@\"'`\\/#", - "using": "name = current_user", - "schema": "public" - }, - "expected_sql_file": "alter_select_policy.sql", - "expected_msql_file": "alter_select_policy_msql.sql" - }, - { - "type": "delete", - "name": "Drop policy", - "endpoint": "NODE-row_security_policy.delete_id", - "data": { - "name": "test_select_rls_policy_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create simple insert event RLS policy", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql", - "data": { - "name": "test_simple_insert_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "policyowner": ["public"], - "event": "INSERT", - "withcheck": "", - "type": "PERMISSIVE", - "schema": "public" - }, - "expected_sql_file": "create_simple_insert_policy.sql", - "expected_msql_file": "create_simple_insert_policy_msql.sql" - }, - { - "type": "alter", - "name": "Alter simple insert event RLS policy by adding check", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "name": "test_simple_insert_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "withcheck": "current_user = name", - "schema": "public" - }, - "expected_sql_file": "alter_simple_insert_policy.sql", - "expected_msql_file": "alter_simple_insert_policy_msql.sql" - }, - { - "type": "delete", - "name": "Drop policy", - "endpoint": "NODE-row_security_policy.delete_id", - "data": { - "name": "test_simple_insert_rls_policy_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create update event restrictive RLS policy with check and using clause", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql", - "data": { - "name": "test_update_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "policyowner": ["public"], - "event": "UPDATE", - "using": "true", - "withcheck": "name != null", - "type": "RESTRICTIVE", - "schema": "public" - }, - "expected_sql_file": "create_update_policy_with_check_and_using.sql", - "expected_msql_file": "create_update_policy_with_check_and_using_msql.sql" - }, - { - "type": "alter", - "name": "Alter update event restrictive RLS policy with check and using clause", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "name": "test_update_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "withcheck": "emp_id != 0", - "using": "current_user=name" - }, - "expected_sql_file": "alter_update_policy_with_check_and_using.sql", - "expected_msql_file": "alter_update_policy_with_check_and_using_msql.sql" - }, - { - "type": "delete", - "name": "Drop policy", - "endpoint": "NODE-row_security_policy.delete_id", - "data": { - "name": "test_update_rls_policy_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create delete event restrictive RLS policy with check", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql", - "data": { - "name": "test_delete_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "policyowner": ["public"], - "event": "DELETE", - "using": "current_user = name", - "withcheck": "", - "type": "RESTRICTIVE", - "schema": "public" - }, - "expected_sql_file": "create_delete_policy_with_using.sql", - "expected_msql_file": "create_delete_policy_with_using_msql.sql" - }, - { - "type": "alter", - "name": "Alter delete event restrictive RLS policy by changing check clause", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "name": "test_delete_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "using": "salary < 1000000000000", - "schema": "public" - }, - "expected_sql_file": "alter_delete_policy_with_using.sql", - "expected_msql_file": "alter_delete_policy_with_using_msql.sql" - }, - { - "type": "delete", - "name": "Drop policy", - "endpoint": "NODE-row_security_policy.delete_id", - "data": { - "name": "test_delete_rls_policy_update_name_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create simple all event restrictive RLS policy", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql", - "data": { - "name": "test_all_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "policyowner": ["public"], - "event": "ALL", - "type": "RESTRICTIVE", - "schema": "public" - }, - "expected_sql_file": "create_simple_all_policy.sql", - "expected_msql_file": "create_simple_all_policy_msql.sql" - }, - { - "type": "alter", - "name": "Alter simple all event restrictive RLS policy with using & check clause", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "name": "test_all_rls_policy_$%{}[]()&*^!@\"'`\\/#", - "using": "true", - "withcheck": "true", - "schema": "public" - }, - "expected_sql_file": "alter_simple_all_policy.sql", - "expected_msql_file": "alter_simple_all_policy_msql.sql" - }, - { - "type": "delete", - "name": "Drop policy", - "endpoint": "NODE-row_security_policy.delete_id", - "data": { - "name": "test_all_rls_policy_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create RLS policy", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "data": { - "name": "test", - "schema": "public" - }, - "expected_sql_file": "create_public_policy.sql" - }, - { - "type": "alter", - "name": "Alter policy name", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "name": "policy_1" - }, - "expected_sql_file": "alter_policy.sql", - "expected_msql_file": "alter_policy_msql.sql" - }, - { - "type": "create", - "name": "Create RLS policy for event 'ALL'", - "endpoint": "NODE-row_security_policy.obj", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "data": { - "name": "all_event_policy", - "event": "ALL", - "policyowner": ["Role_1", "role_2"], - "schema": "public", - "using": "true", - "withcheck": "true", - "type": "RESTRICTIVE" - }, - "expected_sql_file": "create_all_event_policy.sql" - }, - { - "type": "alter", - "name": "Alter policy owner", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "policyowner": ["role_2"] - }, - "expected_sql_file": "alter_owner_policy.sql", - "expected_msql_file": "alter_owner_policy_msql.sql" - }, - { - "type": "alter", - "name": "Alter policy owner remove all users", - "endpoint": "NODE-row_security_policy.obj_id", - "sql_endpoint": "NODE-row_security_policy.sql_id", - "msql_endpoint": "NODE-row_security_policy.msql_id", - "data": { - "policyowner": [] - }, - "expected_sql_file": "alter_remove_all_owner_policy.sql", - "expected_msql_file": "alter_remove_all_owner_policy_msql.sql" - }, - { - "type": "delete", - "name": "Drop policy", - "endpoint": "NODE-row_security_policy.delete_id", - "data": { - "name": "test_delete_policy_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "delete", - "name": "Drop Role", - "endpoint": "NODE-role.obj", - "data": {"ids": ["", ""]}, - "preprocess_data": true - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_select_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_select_policy.sql index 93b0a3fe235..046f964a17b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_select_policy.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_select_policy.sql @@ -7,4 +7,8 @@ CREATE POLICY "test_select_policy_rls_$%{}[]()&*^!@""'`\/#" AS PERMISSIVE FOR SELECT TO public - USING ((name = (CURRENT_USER)::text)); + USING ((name = CURRENT_USER)); + +COMMENT ON POLICY "test_select_policy_rls_$%{}[]()&*^!@""'`\/#" + ON public.test_rls_policy + IS 'This is test description'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_simple_insert_policy.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_simple_insert_policy.sql index 6c3dba682f5..5f0c2705617 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_simple_insert_policy.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_simple_insert_policy.sql @@ -7,4 +7,4 @@ CREATE POLICY "test_simple_insert_rls_policy_$%{}[]()&*^!@""'`\/#" AS PERMISSIVE FOR INSERT TO public - WITH CHECK (((CURRENT_USER)::text = name)); + WITH CHECK ((CURRENT_USER = name)); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_update_policy_with_check_and_using.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_update_policy_with_check_and_using.sql index d9e1b39a5b3..d7d27f80174 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_update_policy_with_check_and_using.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/alter_update_policy_with_check_and_using.sql @@ -7,5 +7,5 @@ CREATE POLICY "test_update_rls_policy_$%{}[]()&*^!@""'`\/#" AS RESTRICTIVE FOR UPDATE TO public - USING (((CURRENT_USER)::text = name)) + USING ((CURRENT_USER = name)) WITH CHECK ((emp_id <> 0)); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_delete_policy_with_using.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_delete_policy_with_using.sql index 82e3f6c65c5..3eb581c5f39 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_delete_policy_with_using.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/tests/default/create_delete_policy_with_using.sql @@ -7,4 +7,4 @@ CREATE POLICY "test_delete_rls_policy_$%{}[]()&*^!@""'`\/#" AS RESTRICTIVE FOR DELETE TO public - USING (((CURRENT_USER)::text = name)); + USING ((CURRENT_USER = name)); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql deleted file mode 100644 index c5cb04dab24..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/create.sql +++ /dev/null @@ -1,60 +0,0 @@ -{% import 'columns/macros/security.macros' as SECLABEL %} -{% import 'columns/macros/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} -{### Add column ###} -{% if data.name and data.cltype %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ADD COLUMN {{conn|qtIdent(data.name)}} {% if is_sql %}{{data.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.attlen, data.attprecision, data.hasSqrBracket) }}{% endif %}{% if data.geometry and not is_sql %}({{data.geometry}}{% if data.srid %},{{data.srid}}{% endif %}){% endif %}{% if data.collspcname %} - COLLATE {{data.collspcname}}{% endif %}{% if data.attnotnull %} - NOT NULL{% endif %}{% if data.defval is defined and data.defval is not none and data.defval != '' and data.colconstype != 'g' %} - DEFAULT {{data.defval}}{% endif %}{% if data.colconstype == 'i' %}{% if data.attidentity and data.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif data.attidentity and data.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} -{% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %} ( {% endif %} -{% if data.seqcycle is defined and data.seqcycle %} -CYCLE {% endif %}{% if data.seqincrement is defined and data.seqincrement|int(-1) > -1 %} -INCREMENT {{data.seqincrement|int}} {% endif %}{% if data.seqstart is defined and data.seqstart|int(-1) > -1%} -START {{data.seqstart|int}} {% endif %}{% if data.seqmin is defined and data.seqmin|int(-1) > -1%} -MINVALUE {{data.seqmin|int}} {% endif %}{% if data.seqmax is defined and data.seqmax|int(-1) > -1%} -MAXVALUE {{data.seqmax|int}} {% endif %}{% if data.seqcache is defined and data.seqcache|int(-1) > -1%} -CACHE {{data.seqcache|int}} {% endif %} -{% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %}){% endif %} -{% endif %}{% endif %}{% if data.colconstype == 'g' and data.genexpr and data.genexpr != '' %} GENERATED ALWAYS AS ({{data.genexpr}}) STORED{% endif %}; - -{### Add comments ###} -{% if data and data.description and data.description != None %} -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} - IS {{data.description|qtLiteral(conn)}}; - -{% endif %} -{### Add variables to column ###} -{% if data.attoptions %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - {{ VARIABLE.SET(conn, 'COLUMN', data.name, data.attoptions) }} - -{% endif %} -{### Alter column statistics value ###} -{% if data.attstattarget is defined and data.attstattarget is not none and data.attstattarget > -1 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {{conn|qtTypeIdent(data.name)}} SET STATISTICS {{data.attstattarget}}; - -{% endif %} -{### Alter column storage value ###} -{% if data.attstorage is defined and data.attstorage != data.defaultstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {{conn|qtTypeIdent(data.name)}} SET STORAGE {%if data.attstorage == 'p' %} -PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} -EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; - -{% endif %} -{### ACL ###} -{% if data.attacl %} -{% for priv in data.attacl %} -{{ PRIVILEGE.APPLY(conn, data.schema, data.table, data.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if data.seclabels %} -{% for r in data.seclabels %} -{{ SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.table, data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/properties.sql deleted file mode 100644 index 085053b6501..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/12_plus/properties.sql +++ /dev/null @@ -1,42 +0,0 @@ -SELECT DISTINCT ON (att.attnum) att.attname as name, att.atttypid, att.attlen, att.attnum, att.attndims, - att.atttypmod, att.attacl, att.attnotnull, att.attoptions, att.attfdwoptions, att.attstattarget, - att.attstorage, att.attidentity, - pg_catalog.pg_get_expr(def.adbin, def.adrelid) AS defval, - pg_catalog.format_type(ty.oid,NULL) AS typname, - pg_catalog.format_type(ty.oid,att.atttypmod) AS displaytypname, - pg_catalog.format_type(ty.oid,att.atttypmod) AS cltype, - CASE WHEN ty.typelem > 0 THEN ty.typelem ELSE ty.oid END as elemoid, - (SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = ty.typnamespace) as typnspname, - ty.typstorage AS defaultstorage, - description, pi.indkey, - (SELECT count(1) FROM pg_catalog.pg_type t2 WHERE t2.typname=ty.typname) > 1 AS isdup, - CASE WHEN length(coll.collname::text) > 0 AND length(nspc.nspname::text) > 0 THEN - pg_catalog.concat(pg_catalog.quote_ident(nspc.nspname),'.',pg_catalog.quote_ident(coll.collname)) - ELSE '' END AS collspcname, - EXISTS(SELECT 1 FROM pg_catalog.pg_constraint WHERE conrelid=att.attrelid AND contype='f' AND att.attnum=ANY(conkey)) As is_fk, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=att.attrelid AND sl1.objsubid=att.attnum) AS seclabels, - (CASE WHEN (att.attnum < 1) THEN true ElSE false END) AS is_sys_column, - (CASE WHEN (att.attidentity in ('a', 'd')) THEN 'i' WHEN (att.attgenerated in ('s')) THEN 'g' ELSE 'n' END) AS colconstype, - (CASE WHEN (att.attgenerated in ('s')) THEN pg_catalog.pg_get_expr(def.adbin, def.adrelid) END) AS genexpr, tab.relname as relname, - (CASE WHEN tab.relkind = 'v' THEN true ELSE false END) AS is_view_only, - seq.* -FROM pg_catalog.pg_attribute att - JOIN pg_catalog.pg_type ty ON ty.oid=atttypid - LEFT OUTER JOIN pg_catalog.pg_attrdef def ON adrelid=att.attrelid AND adnum=att.attnum - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=att.attrelid AND des.objsubid=att.attnum AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN (pg_catalog.pg_depend dep JOIN pg_catalog.pg_class cs ON dep.classid='pg_class'::regclass AND dep.objid=cs.oid AND cs.relkind='S') ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum - LEFT OUTER JOIN pg_catalog.pg_index pi ON pi.indrelid=att.attrelid AND indisprimary - LEFT OUTER JOIN pg_catalog.pg_collation coll ON att.attcollation=coll.oid - LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON coll.collnamespace=nspc.oid - LEFT OUTER JOIN pg_catalog.pg_sequence seq ON cs.oid=seq.seqrelid - LEFT OUTER JOIN pg_catalog.pg_class tab on tab.oid = att.attrelid -WHERE att.attrelid = {{tid}}::oid -{% if clid %} - AND att.attnum = {{clid}}::int -{% endif %} -{### To show system objects ###} -{% if not show_sys_objects %} - AND att.attnum > 0 -{% endif %} - AND att.attisdropped IS FALSE - ORDER BY att.attnum; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/create.sql deleted file mode 100644 index 1dc67b6bfae..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/create.sql +++ /dev/null @@ -1,66 +0,0 @@ -{% import 'columns/macros/security.macros' as SECLABEL %} -{% import 'columns/macros/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} -{### Add column ###} -{% if data.name and data.cltype %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ADD COLUMN {{conn|qtIdent(data.name)}} {% if is_sql %}{{data.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.attlen, data.attprecision, data.hasSqrBracket) }}{% endif %}{% if data.geometry and not is_sql %}({{data.geometry}}{% if data.srid %},{{data.srid}}{% endif %}){% endif %}{% if data.collspcname %} - COLLATE {{data.collspcname}}{% endif %}{% if data.attnotnull %} - NOT NULL{% endif %}{% if data.defval is defined and data.defval is not none and data.defval != '' and data.colconstype != 'g' %} - DEFAULT {{data.defval}}{% endif %}{% if data.colconstype == 'i' %}{% if data.attidentity and data.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif data.attidentity and data.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} -{% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %} ( {% endif %} -{% if data.seqcycle is defined and data.seqcycle %} -CYCLE {% endif %}{% if data.seqincrement is defined and data.seqincrement|int(-1) > -1 %} -INCREMENT {{data.seqincrement|int}} {% endif %}{% if data.seqstart is defined and data.seqstart|int(-1) > -1%} -START {{data.seqstart|int}} {% endif %}{% if data.seqmin is defined and data.seqmin|int(-1) > -1%} -MINVALUE {{data.seqmin|int}} {% endif %}{% if data.seqmax is defined and data.seqmax|int(-1) > -1%} -MAXVALUE {{data.seqmax|int}} {% endif %}{% if data.seqcache is defined and data.seqcache|int(-1) > -1%} -CACHE {{data.seqcache|int}} {% endif %} -{% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %}){% endif %} -{% endif %}{% endif %}{% if data.colconstype == 'g' and data.genexpr and data.genexpr != '' %} GENERATED ALWAYS AS ({{data.genexpr}}) STORED{% endif %}; - -{### Add comments ###} -{% if data and data.description and data.description != None %} -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} - IS {{data.description|qtLiteral(conn)}}; - -{% endif %} -{### Add variables to column ###} -{% if data.attoptions %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - {{ VARIABLE.SET(conn, 'COLUMN', data.name, data.attoptions) }} - -{% endif %} -{### Alter column statistics value ###} -{% if data.attstattarget is defined and data.attstattarget is not none and data.attstattarget > -1 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {{conn|qtTypeIdent(data.name)}} SET STATISTICS {{data.attstattarget}}; - -{% endif %} -{### Alter column storage value ###} -{% if data.attstorage is defined and data.attstorage != data.defaultstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {{conn|qtTypeIdent(data.name)}} SET STORAGE {%if data.attstorage == 'p' %} -PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} -EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; - -{% endif %} -{### Alter column compression value ###} -{% if data.attcompression is defined and data.attcompression is not none and data.attcompression != '' %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {{conn|qtTypeIdent(data.name)}} SET COMPRESSION {{data.attcompression}}; - -{% endif %} -{### ACL ###} -{% if data.attacl %} -{% for priv in data.attacl %} -{{ PRIVILEGE.APPLY(conn, data.schema, data.table, data.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if data.seclabels %} -{% for r in data.seclabels %} -{{ SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.table, data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/properties.sql deleted file mode 100644 index fe6d0376392..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/properties.sql +++ /dev/null @@ -1,61 +0,0 @@ -WITH INH_TABLES AS - (SELECT - at.attname AS name, ph.inhparent AS inheritedid, ph.inhseqno, - pg_catalog.concat(nmsp_parent.nspname, '.',parent.relname ) AS inheritedfrom - FROM - pg_catalog.pg_attribute at - JOIN - pg_catalog.pg_inherits ph ON ph.inhparent = at.attrelid AND ph.inhrelid = 33896::oid - JOIN - pg_catalog.pg_class parent ON ph.inhparent = parent.oid - JOIN - pg_catalog.pg_namespace nmsp_parent ON nmsp_parent.oid = parent.relnamespace - GROUP BY at.attname, ph.inhparent, ph.inhseqno, inheritedfrom - ORDER BY at.attname, ph.inhparent, ph.inhseqno, inheritedfrom - ) -SELECT DISTINCT ON (att.attnum) att.attname as name, att.atttypid, att.attlen, att.attnum, att.attndims, - att.atttypmod, att.attacl, att.attnotnull, att.attoptions, att.attfdwoptions, att.attstattarget, - att.attstorage, att.attidentity, - pg_catalog.pg_get_expr(def.adbin, def.adrelid) AS defval, - pg_catalog.format_type(ty.oid,NULL) AS typname, - pg_catalog.format_type(ty.oid,att.atttypmod) AS displaytypname, - pg_catalog.format_type(ty.oid,att.atttypmod) AS cltype, - inh.inheritedfrom, - inh.inheritedid, - CASE WHEN ty.typelem > 0 THEN ty.typelem ELSE ty.oid END as elemoid, - (SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = ty.typnamespace) as typnspname, - ty.typstorage AS defaultstorage, - description, pi.indkey, - (SELECT count(1) FROM pg_catalog.pg_type t2 WHERE t2.typname=ty.typname) > 1 AS isdup, - CASE WHEN length(coll.collname::text) > 0 AND length(nspc.nspname::text) > 0 THEN - pg_catalog.concat(pg_catalog.quote_ident(nspc.nspname),'.',pg_catalog.quote_ident(coll.collname)) - ELSE '' END AS collspcname, - EXISTS(SELECT 1 FROM pg_catalog.pg_constraint WHERE conrelid=att.attrelid AND contype='f' AND att.attnum=ANY(conkey)) As is_fk, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=att.attrelid AND sl1.objsubid=att.attnum) AS seclabels, - (CASE WHEN (att.attnum < 1) THEN true ElSE false END) AS is_sys_column, - (CASE WHEN (att.attidentity in ('a', 'd')) THEN 'i' WHEN (att.attgenerated in ('s')) THEN 'g' ELSE 'n' END) AS colconstype, - (CASE WHEN (att.attgenerated in ('s')) THEN pg_catalog.pg_get_expr(def.adbin, def.adrelid) END) AS genexpr, tab.relname as relname, - (CASE WHEN tab.relkind = 'v' THEN true ELSE false END) AS is_view_only, - (CASE WHEN att.attcompression = 'p' THEN 'pglz' WHEN att.attcompression = 'l' THEN 'lz4' END) AS attcompression, - seq.* -FROM pg_catalog.pg_attribute att - JOIN pg_catalog.pg_type ty ON ty.oid=atttypid - LEFT OUTER JOIN pg_catalog.pg_attrdef def ON adrelid=att.attrelid AND adnum=att.attnum - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=att.attrelid AND des.objsubid=att.attnum AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN (pg_catalog.pg_depend dep JOIN pg_catalog.pg_class cs ON dep.classid='pg_class'::regclass AND dep.objid=cs.oid AND cs.relkind='S') ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum - LEFT OUTER JOIN pg_catalog.pg_index pi ON pi.indrelid=att.attrelid AND indisprimary - LEFT OUTER JOIN pg_catalog.pg_collation coll ON att.attcollation=coll.oid - LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON coll.collnamespace=nspc.oid - LEFT OUTER JOIN pg_catalog.pg_sequence seq ON cs.oid=seq.seqrelid - LEFT OUTER JOIN pg_catalog.pg_class tab on tab.oid = att.attrelid - LEFT OUTER join INH_TABLES as INH ON att.attname = INH.name -WHERE att.attrelid = {{tid}}::oid -{% if clid %} - AND att.attnum = {{clid}}::int -{% endif %} -{### To show system objects ###} -{% if not show_sys_objects %} - AND att.attnum > 0 -{% endif %} - AND att.attisdropped IS FALSE - ORDER BY att.attnum; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/update.sql deleted file mode 100644 index 4722d3dd10a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/14_plus/update.sql +++ /dev/null @@ -1,215 +0,0 @@ -{% import 'columns/macros/security.macros' as SECLABEL %} -{% import 'columns/macros/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{% 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 IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - RENAME {{conn|qtIdent(o_data.name)}} TO {{conn|qtIdent(data.name)}}; - -{% endif %} -{### Alter column type and collation ###} -{% if (data.cltype and data.cltype != o_data.cltype) or (data.geometry is defined and data.geometry != o_data.geometry) or (data.srid is defined and data.srid != o_data.srid) or (data.attlen is defined and data.attlen != o_data.attlen) or (data.attprecision is defined and data.attprecision != o_data.attprecision) or (data.collspcname and data.collspcname != o_data.collspcname) or data.col_type_conversion is defined %} -{% if data.col_type_conversion is defined and data.col_type_conversion == False %} --- WARNING: --- The SQL statement below would normally be used to alter the datatype for the {{o_data.name}} column, however, --- the current datatype cannot be cast to the target datatype so this conversion cannot be made automatically. - -{% endif %} -{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} -{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname and data.cltype != '"char"' %} - COLLATE {{data.collspcname}}{% elif o_data.collspcname and data.cltype != '"char"' %} COLLATE {{o_data.collspcname}}{% endif %}; -{% endif %} -{### Alter column default value ###} -{% if is_view_only and data.defval is defined and data.defval is not none and data.defval != '' and data.defval != o_data.defval %} -ALTER VIEW {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET DEFAULT {{data.defval}}; - -{% elif data.defval is defined and data.defval is not none and data.defval != '' and data.defval != o_data.defval %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET DEFAULT {{data.defval}}; - -{% endif %} -{### Drop column default value ###} -{% if data.defval is defined and (data.defval == '' or data.defval is none) and data.defval != o_data.defval %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} DROP DEFAULT; - -{% endif %} -{### Alter column not null value ###} -{% if 'attnotnull' in data and data.attnotnull != o_data.attnotnull %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} {% if data.attnotnull %}SET{% else %}DROP{% endif %} NOT NULL; - -{% endif %} -{% if data.seqincrement or (data.seqcycle or (data.seqcycle == False and data.seqcycle != o_data.seqcycle)) or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %} -{% set attidentity_params = true %}{% else %} -{% set attidentity_params = false %}{% endif %} -{### Alter column - add identity ###} -{% if data.colconstype == 'i' and 'attidentity' in data and o_data.attidentity == '' and data.attidentity != o_data.attidentity %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} {% if data.attidentity == 'a' %}ADD GENERATED ALWAYS AS IDENTITY{% else%}ADD GENERATED BY DEFAULT AS IDENTITY{% endif %} -{% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %} ( {% endif %} -{% if data.seqcycle is defined and data.seqcycle %} -CYCLE {% endif %}{% if data.seqincrement is defined and data.seqincrement|int(-1) > -1 %} -INCREMENT {{data.seqincrement|int}} {% endif %}{% if data.seqstart is defined and data.seqstart|int(-1) > -1%} -START {{data.seqstart|int}} {% endif %}{% if data.seqmin is defined and data.seqmin|int(-1) > -1%} -MINVALUE {{data.seqmin|int}} {% endif %}{% if data.seqmax is defined and data.seqmax|int(-1) > -1%} -MAXVALUE {{data.seqmax|int}} {% endif %}{% if data.seqcache is defined and data.seqcache|int(-1) > -1%} -CACHE {{data.seqcache|int}} {% endif %} -{% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %}){% endif %}; - -{### Alter column - change identity - sequence options ###} -{% elif 'attidentity' in data or attidentity_params %} -{% if 'attidentity' in data and data.attidentity != '' and o_data.attidentity != '' and data.attidentity != o_data.attidentity %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET GENERATED {% if data.attidentity == 'a' %}ALWAYS{% else%}BY DEFAULT{% endif %}{% if attidentity_params == false %};{% endif %} -{% elif attidentity_params %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %}{% endif %} -{% if data.seqcycle %} SET CYCLE{% elif (data.seqcycle == False and o_data.seqcycle and data.seqcycle != o_data.seqcycle) %} SET NO CYCLE{% endif %} -{% if data.seqincrement is defined and data.seqincrement|int(-1) > -1 %} SET INCREMENT {{data.seqincrement|int}}{% endif %} -{% if data.seqstart is defined and data.seqstart|int(-1) > -1%} RESTART SET START {{data.seqstart|int}}{% endif %} -{% if data.seqmin is defined and data.seqmin|int(-1) > -1%} SET MINVALUE {{data.seqmin|int}}{% endif %} -{% if data.seqmax is defined and data.seqmax|int(-1) > -1%} SET MAXVALUE {{data.seqmax|int}}{% endif %} -{% if data.seqcache is defined and data.seqcache|int(-1) > -1%} SET CACHE {{data.seqcache|int}}{% endif %}{% if attidentity_params == true %};{% endif %} - - -{% endif %} -{### Alter column - drop identity when column constraint is changed###} -{% if 'colconstype' in data and data.colconstype == 'n' and 'colconstype' in o_data and o_data.colconstype == 'i' %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} DROP IDENTITY; - -{% endif %} -{### Alter column statistics value ###} -{% if data.attstattarget is defined and data.attstattarget != o_data.attstattarget %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET STATISTICS {{data.attstattarget}}; - -{% endif %} -{### Alter column storage value ###} -{% if data.attstorage is defined and data.attstorage != o_data.attstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET STORAGE {%if data.attstorage == 'p' %} -PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} -EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; - -{% endif %} -{### Alter column compression value ###} -{% if data.attcompression is defined and data.attcompression is not none and data.attcompression != '' %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET COMPRESSION {{data.attcompression}}; - -{% endif %} -{% if data.description is defined and data.description != None %} -{% if data.name %} -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, data.name)}} -{% else %} -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.table, o_data.name)}} -{% endif %} - IS {{data.description|qtLiteral(conn)}}; - -{% endif %} -{### Update column variables ###} -{% if 'attoptions' in data and data.attoptions != None and data.attoptions|length > 0 %} -{% set variables = data.attoptions %} -{% if 'deleted' in variables and variables.deleted|length > 0 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} -{% if data.name %} - {{ VARIABLE.UNSET(conn, 'COLUMN', data.name, variables.deleted) }} -{% else %} - {{ VARIABLE.UNSET(conn, 'COLUMN', o_data.name, variables.deleted) }} -{% endif %} -{% endif %} -{% if 'added' in variables and variables.added|length > 0 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} -{% if data.name %} - {{ VARIABLE.SET(conn, 'COLUMN', data.name, variables.added) }} -{% else %} - {{ VARIABLE.SET(conn, 'COLUMN', o_data.name, variables.added) }} -{% endif %} -{% endif %} -{% if 'changed' in variables and variables.changed|length > 0 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} -{% if data.name %} - {{ VARIABLE.SET(conn, 'COLUMN', data.name, variables.changed) }} -{% else %} - {{ VARIABLE.SET(conn, 'COLUMN', o_data.name, variables.changed) }} -{% endif %} -{% endif %} -{% endif %} -{### Update column privileges ###} -{# Change the privileges #} -{% if data.attacl %} -{% if 'deleted' in data.attacl %} -{% for priv in data.attacl.deleted %} -{% if data.name %} -{{ PRIVILEGE.RESETALL(conn, data.schema, data.table, data.name, priv.grantee) }} -{% else %} -{{ PRIVILEGE.RESETALL(conn, data.schema, data.table, o_data.name, priv.grantee) }} -{% endif %} -{% endfor %} -{% endif %} -{% if 'changed' in data.attacl %} -{% for priv in data.attacl.changed %} -{% set is_grantee_changed = (priv.grantee != priv.old_grantee) %} -{% if data.name %} -{% if is_grantee_changed %} -{{ PRIVILEGE.RESETALL(conn, data.schema, data.table, data.name, priv.old_grantee) }} -{% else %} -{{ PRIVILEGE.RESETALL(conn, data.schema, data.table, data.name, priv.grantee) }} -{% endif %} -{{ PRIVILEGE.APPLY(conn, data.schema, data.table, data.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% else %} -{% if is_grantee_changed %} -{{ PRIVILEGE.RESETALL(conn, data.schema, data.table, o_data.name, priv.old_grantee) }} -{% else %} -{{ PRIVILEGE.RESETALL(conn, data.schema, data.table, o_data.name, priv.grantee) }} -{% endif %} -{{ PRIVILEGE.APPLY(conn, data.schema, data.table, o_data.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endif %} -{% endfor %} -{% endif %} -{% if 'added' in data.attacl %} -{% for priv in data.attacl.added %} -{% if data.name %} -{{ PRIVILEGE.APPLY(conn, data.schema, data.table, data.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% else %} -{{ PRIVILEGE.APPLY(conn, data.schema, data.table, o_data.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endif %} -{% endfor %} -{% endif %} -{% endif %} -{### Uppdate tablespace securitylabel ###} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{% if data.name %} -{{ SECLABEL.DROP(conn, 'COLUMN', data.schema, data.table, data.name, r.provider) }} -{% else %} -{{ SECLABEL.DROP(conn, 'COLUMN', data.schema, data.table, o_data.name, r.provider) }} -{% endif %} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{% if data.name %} -{{ SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.table, data.name, r.provider, r.label) }} -{% else %} -{{ SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.table, o_data.name, r.provider, r.label) }} -{% endif %} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{% if data.name %} -{{ SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.table, data.name, r.provider, r.label) }} -{% else %} -{{ SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.table, o_data.name, r.provider, r.label) }} -{% endif %} -{% endfor %} -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql index 6f33f413c2c..1dc67b6bfae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql @@ -5,9 +5,9 @@ {### Add column ###} {% if data.name and data.cltype %} ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - ADD COLUMN IF NOT EXISTS {{conn|qtIdent(data.name)}} {% if is_sql %}{{data.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.attlen, data.attprecision, data.hasSqrBracket) }}{% endif %}{% if data.geometry and not is_sql %}({{data.geometry}}{% if data.srid %},{{data.srid}}{% endif %}){% endif %}{% if data.collspcname %} + ADD COLUMN {{conn|qtIdent(data.name)}} {% if is_sql %}{{data.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.attlen, data.attprecision, data.hasSqrBracket) }}{% endif %}{% if data.geometry and not is_sql %}({{data.geometry}}{% if data.srid %},{{data.srid}}{% endif %}){% endif %}{% if data.collspcname %} COLLATE {{data.collspcname}}{% endif %}{% if data.attnotnull %} - NOT NULL{% endif %}{% if data.defval is defined and data.defval is not none and data.defval != '' %} + NOT NULL{% endif %}{% if data.defval is defined and data.defval is not none and data.defval != '' and data.colconstype != 'g' %} DEFAULT {{data.defval}}{% endif %}{% if data.colconstype == 'i' %}{% if data.attidentity and data.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif data.attidentity and data.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %} ( {% endif %} {% if data.seqcycle is defined and data.seqcycle %} @@ -18,7 +18,7 @@ MINVALUE {{data.seqmin|int}} {% endif %}{% if data.seqmax is defined and data.se MAXVALUE {{data.seqmax|int}} {% endif %}{% if data.seqcache is defined and data.seqcache|int(-1) > -1%} CACHE {{data.seqcache|int}} {% endif %} {% if data.seqincrement or data.seqcycle or data.seqincrement or data.seqstart or data.seqmin or data.seqmax or data.seqcache %}){% endif %} -{% endif %}{% endif %}; +{% endif %}{% endif %}{% if data.colconstype == 'g' and data.genexpr and data.genexpr != '' %} GENERATED ALWAYS AS ({{data.genexpr}}) STORED{% endif %}; {### Add comments ###} {% if data and data.description and data.description != None %} @@ -45,6 +45,12 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; +{% endif %} +{### Alter column compression value ###} +{% if data.attcompression is defined and data.attcompression is not none and data.attcompression != '' %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} + ALTER COLUMN {{conn|qtTypeIdent(data.name)}} SET COMPRESSION {{data.attcompression}}; + {% endif %} {### ACL ###} {% if data.attacl %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/properties.sql index 1d12ef0c4f0..fe6d0376392 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/properties.sql @@ -1,10 +1,27 @@ -SELECT att.attname as name, att.atttypid, att.attlen, att.attnum, att.attndims, +WITH INH_TABLES AS + (SELECT + at.attname AS name, ph.inhparent AS inheritedid, ph.inhseqno, + pg_catalog.concat(nmsp_parent.nspname, '.',parent.relname ) AS inheritedfrom + FROM + pg_catalog.pg_attribute at + JOIN + pg_catalog.pg_inherits ph ON ph.inhparent = at.attrelid AND ph.inhrelid = 33896::oid + JOIN + pg_catalog.pg_class parent ON ph.inhparent = parent.oid + JOIN + pg_catalog.pg_namespace nmsp_parent ON nmsp_parent.oid = parent.relnamespace + GROUP BY at.attname, ph.inhparent, ph.inhseqno, inheritedfrom + ORDER BY at.attname, ph.inhparent, ph.inhseqno, inheritedfrom + ) +SELECT DISTINCT ON (att.attnum) att.attname as name, att.atttypid, att.attlen, att.attnum, att.attndims, att.atttypmod, att.attacl, att.attnotnull, att.attoptions, att.attfdwoptions, att.attstattarget, att.attstorage, att.attidentity, pg_catalog.pg_get_expr(def.adbin, def.adrelid) AS defval, pg_catalog.format_type(ty.oid,NULL) AS typname, pg_catalog.format_type(ty.oid,att.atttypmod) AS displaytypname, pg_catalog.format_type(ty.oid,att.atttypmod) AS cltype, + inh.inheritedfrom, + inh.inheritedid, CASE WHEN ty.typelem > 0 THEN ty.typelem ELSE ty.oid END as elemoid, (SELECT nspname FROM pg_catalog.pg_namespace WHERE oid = ty.typnamespace) as typnspname, ty.typstorage AS defaultstorage, @@ -16,8 +33,10 @@ SELECT att.attname as name, att.atttypid, att.attlen, att.attnum, att.attndims, EXISTS(SELECT 1 FROM pg_catalog.pg_constraint WHERE conrelid=att.attrelid AND contype='f' AND att.attnum=ANY(conkey)) As is_fk, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=att.attrelid AND sl1.objsubid=att.attnum) AS seclabels, (CASE WHEN (att.attnum < 1) THEN true ElSE false END) AS is_sys_column, - (CASE WHEN (att.attidentity in ('a', 'd')) THEN 'i' ELSE 'n' END) AS colconstype, tab.relname as relname, + (CASE WHEN (att.attidentity in ('a', 'd')) THEN 'i' WHEN (att.attgenerated in ('s')) THEN 'g' ELSE 'n' END) AS colconstype, + (CASE WHEN (att.attgenerated in ('s')) THEN pg_catalog.pg_get_expr(def.adbin, def.adrelid) END) AS genexpr, tab.relname as relname, (CASE WHEN tab.relkind = 'v' THEN true ELSE false END) AS is_view_only, + (CASE WHEN att.attcompression = 'p' THEN 'pglz' WHEN att.attcompression = 'l' THEN 'lz4' END) AS attcompression, seq.* FROM pg_catalog.pg_attribute att JOIN pg_catalog.pg_type ty ON ty.oid=atttypid @@ -29,6 +48,7 @@ FROM pg_catalog.pg_attribute att LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON coll.collnamespace=nspc.oid LEFT OUTER JOIN pg_catalog.pg_sequence seq ON cs.oid=seq.seqrelid LEFT OUTER JOIN pg_catalog.pg_class tab on tab.oid = att.attrelid + LEFT OUTER join INH_TABLES as INH ON att.attname = INH.name WHERE att.attrelid = {{tid}}::oid {% if clid %} AND att.attnum = {{clid}}::int diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql index a98bcf8f5c1..4722d3dd10a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql @@ -17,7 +17,7 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} {% endif %} {% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %}ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} -{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{%if data.collspcname and data.collspcname != o_data.collspcname and data.cltype != '"char"' %} +{% if data.col_type_conversion is defined and data.col_type_conversion == False %} -- {% endif %} ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} TYPE {{ GET_TYPE.UPDATE_TYPE_SQL(conn, data, o_data) }}{% if data.collspcname and data.collspcname != o_data.collspcname and data.cltype != '"char"' %} COLLATE {{data.collspcname}}{% elif o_data.collspcname and data.cltype != '"char"' %} COLLATE {{o_data.collspcname}}{% endif %}; {% endif %} {### Alter column default value ###} @@ -95,6 +95,12 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} PLAIN{% elif data.attstorage == 'm'%}MAIN{% elif data.attstorage == 'e'%} EXTERNAL{% elif data.attstorage == 'x'%}EXTENDED{% endif %}; +{% endif %} +{### Alter column compression value ###} +{% if data.attcompression is defined and data.attcompression is not none and data.attcompression != '' %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} + ALTER COLUMN {% if data.name %}{{conn|qtTypeIdent(data.name)}}{% else %}{{conn|qtTypeIdent(o_data.name)}}{% endif %} SET COMPRESSION {{data.attcompression}}; + {% endif %} {% if data.description is defined and data.description != None %} {% if data.name %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/count.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/count.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/count.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/enable_disable_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/enable_disable_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/enable_disable_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/enable_disable_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/get_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/get_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/get_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/get_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/get_parent.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/get_parent.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/get_parent.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/get_parent.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/12_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/compound_triggers/sql/ppas/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/create.sql deleted file mode 100644 index 0e9f2ecc22b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/create.sql +++ /dev/null @@ -1,21 +0,0 @@ -ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.table) }} - ADD{% if data.name %} CONSTRAINT {{ conn|qtIdent(data.name) }}{% endif%} EXCLUDE {% if data.amname and data.amname != '' %}USING {{data.amname}}{% endif %} ( - {% for col in data.columns %}{% if loop.index != 1 %}, - {% endif %}{% if col.is_exp %}{{col.column}}{% else %}{{ conn|qtIdent(col.column)}}{% endif %}{% if col.oper_class and col.oper_class != '' %} {{col.oper_class}}{% endif%}{% if col.order is defined and col.is_sort_nulls_applicable %}{% if col.order %} ASC{% else %} DESC{% endif %} NULLS{% endif %} {% if col.nulls_order is defined and col.is_sort_nulls_applicable %}{% if col.nulls_order %}FIRST {% else %}LAST {% endif %}{% endif %}WITH {{col.operator}}{% endfor %}){% if data.include|length > 0 %} - - INCLUDE ({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}){% endif %}{% if data.fillfactor %} - - WITH (FILLFACTOR={{data.fillfactor}}){% endif %}{% if data.spcname and data.spcname != "pg_default" %} - - USING INDEX TABLESPACE {{ conn|qtIdent(data.spcname) }}{% endif %}{% if data.indconstraint %} - - WHERE ({{data.indconstraint}}){% endif%} -{% if data.condeferrable %} - - DEFERRABLE{% if data.condeferred %} - INITIALLY DEFERRED{% endif%}{% endif%}; -{% if data.comment and data.name %} - -COMMENT ON CONSTRAINT {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/properties.sql deleted file mode 100644 index 6d3fd1a2089..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/properties.sql +++ /dev/null @@ -1,33 +0,0 @@ -SELECT cls.oid, - cls.relname as name, - indnkeyatts as col_count, - amname, - CASE WHEN length(spcname::text) > 0 THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, - CASE contype - WHEN 'p' THEN desp.description - WHEN 'u' THEN desp.description - WHEN 'x' THEN desp.description - ELSE des.description - END AS comment, - condeferrable, - condeferred, - substring(pg_catalog.array_to_string(cls.reloptions, ',') from 'fillfactor=([0-9]*)') AS fillfactor, - pg_catalog.pg_get_expr(idx.indpred, idx.indrelid, true) AS indconstraint -FROM pg_catalog.pg_index idx -JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid -LEFT OUTER JOIN pg_catalog.pg_tablespace ta on ta.oid=cls.reltablespace -JOIN pg_catalog.pg_am am ON am.oid=cls.relam -LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') -LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=cls.oid AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0 AND desp.classoid='pg_constraint'::regclass) -WHERE indrelid = {{tid}}::oid -{% if cid %} -AND cls.oid = {{cid}}::oid -{% endif %} -AND contype='x' -ORDER BY cls.relname diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/create.sql index 8ebe6f9f8a7..0e9f2ecc22b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/create.sql @@ -1,7 +1,9 @@ ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.table) }} ADD{% if data.name %} CONSTRAINT {{ conn|qtIdent(data.name) }}{% endif%} EXCLUDE {% if data.amname and data.amname != '' %}USING {{data.amname}}{% endif %} ( {% for col in data.columns %}{% if loop.index != 1 %}, - {% endif %}{% if col.is_exp %}{{col.column}}{% else %}{{ conn|qtIdent(col.column)}}{% endif %}{% if col.oper_class and col.oper_class != '' %} {{col.oper_class}}{% endif%}{% if col.order is defined and col.is_sort_nulls_applicable %}{% if col.order %} ASC{% else %} DESC{% endif %} NULLS{% endif %} {% if col.nulls_order is defined and col.is_sort_nulls_applicable %}{% if col.nulls_order %}FIRST {% else %}LAST {% endif %}{% endif %}WITH {{col.operator}}{% endfor %}){% if data.fillfactor %} + {% endif %}{% if col.is_exp %}{{col.column}}{% else %}{{ conn|qtIdent(col.column)}}{% endif %}{% if col.oper_class and col.oper_class != '' %} {{col.oper_class}}{% endif%}{% if col.order is defined and col.is_sort_nulls_applicable %}{% if col.order %} ASC{% else %} DESC{% endif %} NULLS{% endif %} {% if col.nulls_order is defined and col.is_sort_nulls_applicable %}{% if col.nulls_order %}FIRST {% else %}LAST {% endif %}{% endif %}WITH {{col.operator}}{% endfor %}){% if data.include|length > 0 %} + + INCLUDE ({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}){% endif %}{% if data.fillfactor %} WITH (FILLFACTOR={{data.fillfactor}}){% endif %}{% if data.spcname and data.spcname != "pg_default" %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/get_constraint_include.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_include.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/11_plus/get_constraint_include.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/get_constraint_include.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/properties.sql index d27fcced430..6d3fd1a2089 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/exclusion_constraint/sql/default/properties.sql @@ -1,6 +1,6 @@ SELECT cls.oid, cls.relname as name, - indnatts as col_count, + indnkeyatts as col_count, amname, CASE WHEN length(spcname::text) > 0 THEN spcname ELSE (SELECT sp.spcname FROM pg_catalog.pg_database dtb diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/create.sql deleted file mode 100644 index c5c54a12fe9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/create.sql +++ /dev/null @@ -1,20 +0,0 @@ -ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.table) }} - ADD{% if data.name %} CONSTRAINT {{ conn|qtIdent(data.name) }}{% endif%} {{constraint_name}} {% if data.index %}USING INDEX {{ conn|qtIdent(data.index) }}{% else %} -({% for columnobj in data.columns %}{% if loop.index != 1 %} -, {% endif %}{{ conn|qtIdent(columnobj.column)}}{% endfor %}){% if data.include|length > 0 %} - - INCLUDE ({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}){% endif %} -{% if data.fillfactor %} - - WITH (FILLFACTOR={{data.fillfactor}}){% endif %}{% if data.spcname and data.spcname != "pg_default" %} - - USING INDEX TABLESPACE {{ conn|qtIdent(data.spcname) }}{% endif %}{% endif %}{% if data.condeferrable %} - - DEFERRABLE{% if data.condeferred %} - INITIALLY DEFERRED{% endif%} -{% endif -%}; -{% if data.comment and data.name %} - -COMMENT ON CONSTRAINT {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/properties.sql deleted file mode 100644 index 220a3d84fb7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/properties.sql +++ /dev/null @@ -1,31 +0,0 @@ -SELECT cls.oid, - cls.relname as name, - indnkeyatts as col_count, - CASE WHEN length(spcname::text) > 0 THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, - CASE contype - WHEN 'p' THEN desp.description - WHEN 'u' THEN desp.description - WHEN 'x' THEN desp.description - ELSE des.description - END AS comment, - condeferrable, - condeferred, - conislocal, - substring(pg_catalog.array_to_string(cls.reloptions, ',') from 'fillfactor=([0-9]*)') AS fillfactor -FROM pg_catalog.pg_index idx -JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid -LEFT OUTER JOIN pg_catalog.pg_tablespace ta on ta.oid=cls.reltablespace -LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') -LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=cls.oid AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0 AND desp.classoid='pg_constraint'::regclass) -WHERE indrelid = {{tid}}::oid -{% if cid %} -AND cls.oid = {{cid}}::oid -{% endif %} -AND contype='{{constraint_type}}' -ORDER BY cls.relname diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/create.sql index 521dc504150..c5c54a12fe9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/create.sql @@ -1,7 +1,10 @@ ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.table) }} ADD{% if data.name %} CONSTRAINT {{ conn|qtIdent(data.name) }}{% endif%} {{constraint_name}} {% if data.index %}USING INDEX {{ conn|qtIdent(data.index) }}{% else %} ({% for columnobj in data.columns %}{% if loop.index != 1 %} -, {% endif %}{{ conn|qtIdent(columnobj.column)}}{% endfor %}){% if data.fillfactor %} +, {% endif %}{{ conn|qtIdent(columnobj.column)}}{% endfor %}){% if data.include|length > 0 %} + + INCLUDE ({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}){% endif %} +{% if data.fillfactor %} WITH (FILLFACTOR={{data.fillfactor}}){% endif %}{% if data.spcname and data.spcname != "pg_default" %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/get_constraint_include.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/get_constraint_include.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/11_plus/get_constraint_include.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/get_constraint_include.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/properties.sql index 83ade7ff0c1..220a3d84fb7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index_constraint/sql/default/properties.sql @@ -1,6 +1,6 @@ SELECT cls.oid, cls.relname as name, - indnatts as col_count, + indnkeyatts as col_count, CASE WHEN length(spcname::text) > 0 THEN spcname ELSE (SELECT sp.spcname FROM pg_catalog.pg_database dtb JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/column_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/column_details.sql deleted file mode 100644 index 05c468df5f2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/column_details.sql +++ /dev/null @@ -1,33 +0,0 @@ -SELECT - i.indexrelid, - CASE i.indoption[i.attnum - 1] - WHEN 0 THEN ARRAY['ASC', 'NULLS LAST'] - WHEN 1 THEN ARRAY['DESC', 'NULLS LAST'] - WHEN 2 THEN ARRAY['ASC', 'NULLS FIRST'] - WHEN 3 THEN ARRAY['DESC', 'NULLS FIRST'] - ELSE ARRAY['UNKNOWN OPTION' || i.indoption[i.attnum - 1]::text, ''] - END::text[] AS options, - i.attnum, - pg_catalog.pg_get_indexdef(i.indexrelid, i.attnum, true) as attdef, - CASE WHEN pg_catalog.pg_get_indexdef(i.indexrelid, i.attnum, true) = a.attname THEN FALSE ELSE TRUE END AS is_exp, - a.attstattarget as statistics, - CASE WHEN (o.opcdefault = FALSE) THEN o.opcname ELSE null END AS opcname, - op.oprname AS oprname, - CASE WHEN length(nspc.nspname::text) > 0 AND length(coll.collname::text) > 0 THEN - pg_catalog.concat(pg_catalog.quote_ident(nspc.nspname), '.', pg_catalog.quote_ident(coll.collname)) - ELSE '' END AS collnspname -FROM ( - SELECT - indexrelid, i.indoption, i.indclass, - pg_catalog.unnest(ARRAY(SELECT pg_catalog.generate_series(1, i.indnkeyatts) AS n)) AS attnum - FROM - pg_catalog.pg_index i - WHERE i.indexrelid = {{idx}}::OID -) i - LEFT JOIN pg_catalog.pg_opclass o ON (o.oid = i.indclass[i.attnum - 1]) - LEFT OUTER JOIN pg_catalog.pg_constraint c ON (c.conindid = i.indexrelid) - LEFT OUTER JOIN pg_catalog.pg_operator op ON (op.oid = c.conexclop[i.attnum]) - LEFT JOIN pg_catalog.pg_attribute a ON (a.attrelid = i.indexrelid AND a.attnum = i.attnum) - LEFT OUTER JOIN pg_catalog.pg_collation coll ON a.attcollation=coll.oid - LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON coll.collnamespace=nspc.oid -ORDER BY i.attnum; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/create.sql deleted file mode 100644 index b264f42cec9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/create.sql +++ /dev/null @@ -1,26 +0,0 @@ -CREATE{% if data.indisunique %} UNIQUE{% endif %} INDEX{% if add_not_exists_clause %} IF NOT EXISTS{% endif %}{% if data.isconcurrent %} CONCURRENTLY{% endif %}{% if data.name %} {{conn|qtIdent(data.name)}}{% endif %} - - ON {% if data.indisonly %}ONLY {% endif %}{{conn|qtIdent(data.schema, data.table)}} {% if data.amname %}USING {{conn|qtIdent(data.amname)}}{% endif %} - -{% if mode == 'create' %} - ({% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{% if c.is_exp %}({{c.colname}}){% else %}{{conn|qtIdent(c.colname)}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.op_class %} - {{c.op_class}}{% endif %}{% if data.amname is defined %}{% if c.sort_order is defined and c.is_sort_nulls_applicable %}{% if c.sort_order %} DESC{% else %} ASC{% endif %}{% endif %}{% if c.nulls is defined and c.is_sort_nulls_applicable %} NULLS {% if c.nulls %} -FIRST{% else %}LAST{% endif %}{% endif %}{% endif %}{% endfor %}) -{% if data.include|length > 0 %} - INCLUDE({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}) -{% endif %} -{% else %} -{## We will get indented data from postgres for column ##} - ({% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{c.colname}}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.op_class %} - {{c.op_class}}{% endif %}{% if c.sort_order is defined %}{% if c.sort_order %} DESC{% else %} ASC{% endif %}{% endif %}{% if c.nulls is defined %} NULLS {% if c.nulls %} -FIRST{% else %}LAST{% endif %}{% endif %}{% endfor %}) -{% if data.include|length > 0 %} - INCLUDE({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}) -{% endif %} -{% endif %} -{% if data.storage_parameters %} - WITH ({% for key, value in data.storage_parameters.items() %}{% if loop.index != 1 %}, {% endif %}{{key}}={{value}}{% endfor %}) -{% endif %}{% if data.spcname %} - TABLESPACE {{conn|qtIdent(data.spcname)}}{% endif %}{% if data.indconstraint %} - - WHERE {{data.indconstraint}}{% endif %}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql deleted file mode 100644 index 4784815f9b0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql +++ /dev/null @@ -1,73 +0,0 @@ -SELECT DISTINCT ON (cls.relname) - cls.oid, - cls.relname AS name, - idx.indrelid, - idx.indkey, - idx.indisclustered, - idx.indisvalid, - idx.indisunique, - idx.indisprimary, - n.nspname, - idx.indnatts, - COALESCE(cls.reltablespace, 0) AS spcoid, - COALESCE( - CASE - WHEN (cls.reltablespace <> 0 OR cls.relkind = 'I') THEN ta.spcname - ELSE ( - SELECT sp.spcname - FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace = sp.oid - WHERE dtb.oid = {{ did }}::oid - LIMIT 1 - ) - END, 'pg_default' - ) AS spcname, - con.conname, - tab.relname AS tabname, - idx.indclass, - con.oid AS conoid, - CASE - WHEN con.contype IN ('p', 'u', 'x') THEN desp.description - ELSE des.description - END AS description, - pg_catalog.pg_get_expr(idx.indpred, idx.indrelid, true) AS indconstraint, - con.contype, - con.condeferrable, - con.condeferred, - am.amname, - EXISTS ( - SELECT 1 FROM pg_catalog.pg_inherits inh WHERE inh.inhrelid = cls.oid - ) AS is_inherited, - substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int AS fillfactor, - substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int AS gin_pending_list_limit, - substring(array_to_string(cls.reloptions, ',') FROM 'pages_per_range=([0-9]*)')::int AS pages_per_range, - substring(array_to_string(cls.reloptions, ',') FROM 'buffering=([a-z]*)') AS buffering, - substring(array_to_string(cls.reloptions, ',') FROM 'fastupdate=([a-z]*)')::boolean AS fastupdate, - substring(array_to_string(cls.reloptions, ',') FROM 'autosummarize=([a-z]*)')::boolean AS autosummarize, - substring(array_to_string(cls.reloptions, ',') FROM 'lists=([0-9]*)')::int AS lists - - {% if datlastsysoid %} - , (cls.oid <= {{ datlastsysoid }}::oid) AS is_sys_idx - {% endif %} -FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid = idx.indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid = idx.indrelid - LEFT JOIN pg_catalog.pg_tablespace ta ON ta.oid = cls.reltablespace - JOIN pg_catalog.pg_namespace n ON n.oid = tab.relnamespace - JOIN pg_catalog.pg_am am ON am.oid = cls.relam - LEFT JOIN pg_catalog.pg_depend dep ON dep.classid = cls.tableoid - AND dep.objid = cls.oid - AND dep.refobjsubid = 0 - AND dep.refclassid = (SELECT oid FROM pg_catalog.pg_class WHERE relname = 'pg_constraint') - AND dep.deptype = 'i' - LEFT JOIN pg_catalog.pg_constraint con ON con.tableoid = dep.refclassid AND con.oid = dep.refobjid - LEFT JOIN pg_catalog.pg_description des ON des.objoid = cls.oid AND des.classoid = 'pg_class'::regclass - LEFT JOIN pg_catalog.pg_description desp ON desp.objoid = con.oid AND desp.objsubid = 0 AND desp.classoid = 'pg_constraint'::regclass -WHERE idx.indrelid = {{ tid }}::OID - {% if not show_sys_objects %} - AND con.conname IS NULL - {% endif %} - {% if idx %} - AND cls.oid = {{ idx }}::OID - {% endif %} -ORDER BY cls.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/create.sql deleted file mode 100644 index 4ce3030af56..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/create.sql +++ /dev/null @@ -1,33 +0,0 @@ -CREATE{% if data.indisunique %} UNIQUE{% endif %} INDEX{% if add_not_exists_clause %} IF NOT EXISTS{% endif %}{% if data.isconcurrent %} CONCURRENTLY{% endif %}{% if data.name %} {{conn|qtIdent(data.name)}}{% endif %} - - ON {% if data.indisonly %}ONLY {% endif %}{{conn|qtIdent(data.schema, data.table)}} {% if data.amname %}USING {{conn|qtIdent(data.amname)}}{% endif %} - -{% if mode == 'create' %} - ({% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{% if c.is_exp %}({{c.colname}}){% else %}{{conn|qtIdent(c.colname)}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.op_class %} - {{c.op_class}}{% endif %}{% if data.amname is defined %}{% if c.sort_order is defined and c.is_sort_nulls_applicable %}{% if c.sort_order %} DESC{% else %} ASC{% endif %}{% endif %}{% if c.nulls is defined and c.is_sort_nulls_applicable %} NULLS {% if c.nulls %} -FIRST{% else %}LAST{% endif %}{% endif %}{% endif %}{% endfor %}) -{% if data.include|length > 0 %} - INCLUDE({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}) -{% endif %} -{% else %} -{## We will get indented data from postgres for column ##} - ({% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{c.colname}}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.op_class %} - {{c.op_class}}{% endif %}{% if c.sort_order is defined %}{% if c.sort_order %} DESC{% else %} ASC{% endif %}{% endif %}{% if c.nulls is defined %} NULLS {% if c.nulls %} -FIRST{% else %}LAST{% endif %}{% endif %}{% endfor %}) -{% if data.include|length > 0 %} - INCLUDE({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}) -{% endif %} -{% endif %} -{% if data.storage_parameters %} - WITH ({% for key, value in data.storage_parameters.items() %}{% if loop.index != 1 %}, {% endif %}{{key}}={{value}}{% endfor %}) -{% endif %}{% if data.spcname %} - TABLESPACE {{conn|qtIdent(data.spcname)}}{% endif %}{% if data.indconstraint %} - - WHERE {{data.indconstraint}}{% endif %}; -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER INDEX {{ conn|qtIdent(data.schema, data.name) }} - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql deleted file mode 100644 index 00b6c69558c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/properties.sql +++ /dev/null @@ -1,80 +0,0 @@ -SELECT DISTINCT ON (cls.relname) - cls.oid, - cls.relname AS name, - idx.indrelid, - idx.indkey, - idx.indisclustered, - idx.indisvalid, - idx.indisunique, - idx.indisprimary, - n.nspname, - idx.indnatts, - COALESCE(cls.reltablespace, 0) AS spcoid, - COALESCE( - CASE - WHEN (cls.reltablespace <> 0 OR cls.relkind = 'I') THEN ta.spcname - ELSE ( - SELECT sp.spcname - FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace = sp.oid - WHERE dtb.oid = {{ did }}::oid - LIMIT 1 - ) - END, 'pg_default' - ) AS spcname, - con.conname, - tab.relname AS tabname, - idx.indclass, - con.oid AS conoid, - CASE - WHEN con.contype IN ('p', 'u', 'x') THEN desp.description - ELSE des.description - END AS description, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = cls.oid - ) AS dependsonextensions, - pg_catalog.pg_get_expr(idx.indpred, idx.indrelid, true) AS indconstraint, - con.contype, - con.condeferrable, - con.condeferred, - am.amname, - EXISTS ( - SELECT 1 FROM pg_catalog.pg_inherits inh WHERE inh.inhrelid = cls.oid - ) AS is_inherited, - -- Options (with defaults per index type) - substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int AS fillfactor, - substring(array_to_string(cls.reloptions, ',') FROM 'deduplicate_items=([a-z]*)')::boolean AS deduplicate_items, - substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int AS gin_pending_list_limit, - substring(array_to_string(cls.reloptions, ',') FROM 'pages_per_range=([0-9]*)')::int AS pages_per_range, - substring(array_to_string(cls.reloptions, ',') FROM 'buffering=([a-z]*)') AS buffering, - substring(array_to_string(cls.reloptions, ',') FROM 'fastupdate=([a-z]*)') AS fastupdate, - substring(array_to_string(cls.reloptions, ',') FROM 'autosummarize=([a-z]*)')::boolean AS autosummarize, - substring(array_to_string(cls.reloptions, ',') FROM 'lists=([0-9]*)')::int AS lists - {% if datlastsysoid %} - , (cls.oid <= {{ datlastsysoid }}::oid) AS is_sys_idx - {% endif %} -FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid = idx.indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid = idx.indrelid - LEFT JOIN pg_catalog.pg_tablespace ta ON ta.oid = cls.reltablespace - JOIN pg_catalog.pg_namespace n ON n.oid = tab.relnamespace - JOIN pg_catalog.pg_am am ON am.oid = cls.relam - LEFT JOIN pg_catalog.pg_depend dep ON dep.classid = cls.tableoid - AND dep.objid = cls.oid - AND dep.refobjsubid = 0 - AND dep.refclassid = (SELECT oid FROM pg_catalog.pg_class WHERE relname = 'pg_constraint') - AND dep.deptype = 'i' - LEFT JOIN pg_catalog.pg_constraint con ON con.tableoid = dep.refclassid AND con.oid = dep.refobjid - LEFT JOIN pg_catalog.pg_description des ON des.objoid = cls.oid AND des.classoid = 'pg_class'::regclass - LEFT JOIN pg_catalog.pg_description desp ON desp.objoid = con.oid AND desp.objsubid = 0 AND desp.classoid = 'pg_constraint'::regclass -WHERE idx.indrelid = {{ tid }}::OID - {% if not show_sys_objects %} - AND con.conname IS NULL - {% endif %} - {% if idx %} - AND cls.oid = {{ idx }}::OID - {% endif %} -ORDER BY cls.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/update.sql deleted file mode 100644 index 25fe327978a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/13_plus/update.sql +++ /dev/null @@ -1,110 +0,0 @@ -{## Changes name ##} -{% if data.name and o_data.name != data.name %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, o_data.name)}} - RENAME TO {{conn|qtIdent(data.name)}}; - -{% endif %} -{## Changes fillfactor ##} -{% if data.fillfactor and o_data.fillfactor != data.fillfactor %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (fillfactor={{data.fillfactor}}); - -{% elif (data.fillfactor == '' or data.fillfactor == None) and o_data.fillfactor|default('', 'true') != data.fillfactor %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (fillfactor); - -{% endif %} -{## Changes gin_pending_list_limit ##} -{% if data.gin_pending_list_limit and o_data.gin_pending_list_limit != data.gin_pending_list_limit %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (gin_pending_list_limit={{data.gin_pending_list_limit}}); - -{% elif (data.gin_pending_list_limit == '' or data.gin_pending_list_limit == None) and o_data.gin_pending_list_limit|default('', 'true') != data.gin_pending_list_limit %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (gin_pending_list_limit); - -{% endif %} -{## Changes deduplicate_items ##} -{% if data.deduplicate_items in [True, False] and o_data.deduplicate_items != data.deduplicate_items %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (deduplicate_items={{data.deduplicate_items}}); - -{% endif %} - -{## Changes pages_per_range ##} -{% if data.pages_per_range and o_data.pages_per_range != data.pages_per_range %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (pages_per_range={{data.pages_per_range}}); - -{% elif (data.pages_per_range == '' or data.pages_per_range == None) and o_data.pages_per_range|default('', 'true') != data.pages_per_range %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (pages_per_range); - -{% endif %} -{## Changes buffering ##} -{% if data.buffering and o_data.buffering != data.buffering %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (buffering={{data.buffering}}); - -{% elif (data.buffering == '' or data.buffering == None) and o_data.buffering|default('', 'true') != data.buffering %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (buffering); - -{% endif %} -{## Changes fastupdate ##} -{% if data.fastupdate in [True, False] and o_data.fastupdate != data.fastupdate %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (fastupdate={{data.fastupdate}}); - -{% endif %} -{## Changes autosummarize ##} -{% if data.autosummarize in [True, False] and o_data.autosummarize != data.autosummarize %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (autosummarize={{data.autosummarize}}); - -{% endif %} -{## Changes tablespace ##} -{% if data.spcname and o_data.spcname != data.spcname %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET TABLESPACE {{conn|qtIdent(data.spcname)}}; - -{% endif %} -{## Alter index to use cluster type ##} -{% if data.indisclustered is defined and o_data.indisclustered != data.indisclustered %} -{% if data.indisclustered %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - CLUSTER ON {{conn|qtIdent(data.name)}}; - -{% else %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.table)}} - SET WITHOUT CLUSTER; - -{% endif %} -{% endif %} -{## Changes description ##} -{% if data.description is defined and o_data.description != data.description %} -COMMENT ON INDEX {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}};{% endif %} - -{## Alter column statistics##} -{% if update_column %} -{% for col in update_column_data %} -ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{col.col_num}} SET STATISTICS {{col.statistics}}; - -{% endfor %} -{% endif %} -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER INDEX {{ conn|qtIdent(data.schema, data.name) }} - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER INDEX {{ conn|qtIdent(data.schema, data.name) }} - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/column_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/column_details.sql index 9e79b0cff67..05c468df5f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/column_details.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/column_details.sql @@ -19,7 +19,7 @@ SELECT FROM ( SELECT indexrelid, i.indoption, i.indclass, - pg_catalog.unnest(ARRAY(SELECT pg_catalog.generate_series(1, i.indnatts) AS n)) AS attnum + pg_catalog.unnest(ARRAY(SELECT pg_catalog.generate_series(1, i.indnkeyatts) AS n)) AS attnum FROM pg_catalog.pg_index i WHERE i.indexrelid = {{idx}}::OID diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/create.sql index 38f5b9d2865..4ce3030af56 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/create.sql @@ -1,20 +1,33 @@ CREATE{% if data.indisunique %} UNIQUE{% endif %} INDEX{% if add_not_exists_clause %} IF NOT EXISTS{% endif %}{% if data.isconcurrent %} CONCURRENTLY{% endif %}{% if data.name %} {{conn|qtIdent(data.name)}}{% endif %} - ON {{conn|qtIdent(data.schema, data.table)}} {% if data.amname %}USING {{conn|qtIdent(data.amname)}}{% endif %} + ON {% if data.indisonly %}ONLY {% endif %}{{conn|qtIdent(data.schema, data.table)}} {% if data.amname %}USING {{conn|qtIdent(data.amname)}}{% endif %} {% if mode == 'create' %} ({% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{% if c.is_exp %}({{c.colname}}){% else %}{{conn|qtIdent(c.colname)}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.op_class %} {{c.op_class}}{% endif %}{% if data.amname is defined %}{% if c.sort_order is defined and c.is_sort_nulls_applicable %}{% if c.sort_order %} DESC{% else %} ASC{% endif %}{% endif %}{% if c.nulls is defined and c.is_sort_nulls_applicable %} NULLS {% if c.nulls %} FIRST{% else %}LAST{% endif %}{% endif %}{% endif %}{% endfor %}) +{% if data.include|length > 0 %} + INCLUDE({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}) +{% endif %} {% else %} {## We will get indented data from postgres for column ##} ({% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{c.colname}}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.op_class %} {{c.op_class}}{% endif %}{% if c.sort_order is defined %}{% if c.sort_order %} DESC{% else %} ASC{% endif %}{% endif %}{% if c.nulls is defined %} NULLS {% if c.nulls %} FIRST{% else %}LAST{% endif %}{% endif %}{% endfor %}) +{% if data.include|length > 0 %} + INCLUDE({% for col in data.include %}{% if loop.index != 1 %}, {% endif %}{{conn|qtIdent(col)}}{% endfor %}) +{% endif %} {% endif %} -{% if data.fillfactor %} - WITH (fillfactor={{data.fillfactor}}) +{% if data.storage_parameters %} + WITH ({% for key, value in data.storage_parameters.items() %}{% if loop.index != 1 %}, {% endif %}{{key}}={{value}}{% endfor %}) {% endif %}{% if data.spcname %} TABLESPACE {{conn|qtIdent(data.spcname)}}{% endif %}{% if data.indconstraint %} WHERE {{data.indconstraint}}{% endif %}; +{% if data.dependsonextensions %} +{% for ext in data.dependsonextensions %} + +ALTER INDEX {{ conn|qtIdent(data.schema, data.name) }} + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endfor %} +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/include_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/include_details.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/include_details.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/include_details.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql index a26ec0d80d8..00b6c69558c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql @@ -1,30 +1,80 @@ -SELECT DISTINCT ON(cls.relname) cls.oid, cls.relname as name, indrelid, indkey, indisclustered, - indisvalid, indisunique, indisprimary, n.nspname,indnatts,cls.reltablespace AS spcoid, - CASE WHEN (length(spcname::text) > 0 OR cls.relkind = 'I') THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, conname, - tab.relname as tabname, indclass, con.oid AS conoid, - CASE WHEN contype IN ('p', 'u', 'x') THEN desp.description - ELSE des.description END AS description, - pg_catalog.pg_get_expr(indpred, indrelid, true) as indconstraint, contype, condeferrable, condeferred, amname, - (SELECT (CASE WHEN count(i.inhrelid) > 0 THEN true ELSE false END) FROM pg_catalog.pg_inherits i WHERE i.inhrelid = cls.oid) as is_inherited, - substring(pg_catalog.array_to_string(cls.reloptions, ',') from 'fillfactor=([0-9]*)') AS fillfactor - {% if datlastsysoid %}, (CASE WHEN cls.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_idx {% endif %} +SELECT DISTINCT ON (cls.relname) + cls.oid, + cls.relname AS name, + idx.indrelid, + idx.indkey, + idx.indisclustered, + idx.indisvalid, + idx.indisunique, + idx.indisprimary, + n.nspname, + idx.indnatts, + COALESCE(cls.reltablespace, 0) AS spcoid, + COALESCE( + CASE + WHEN (cls.reltablespace <> 0 OR cls.relkind = 'I') THEN ta.spcname + ELSE ( + SELECT sp.spcname + FROM pg_catalog.pg_database dtb + JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace = sp.oid + WHERE dtb.oid = {{ did }}::oid + LIMIT 1 + ) + END, 'pg_default' + ) AS spcname, + con.conname, + tab.relname AS tabname, + idx.indclass, + con.oid AS conoid, + CASE + WHEN con.contype IN ('p', 'u', 'x') THEN desp.description + ELSE des.description + END AS description, + ( + SELECT array_agg(DISTINCT e.extname) + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid + WHERE d.objid = cls.oid + ) AS dependsonextensions, + pg_catalog.pg_get_expr(idx.indpred, idx.indrelid, true) AS indconstraint, + con.contype, + con.condeferrable, + con.condeferred, + am.amname, + EXISTS ( + SELECT 1 FROM pg_catalog.pg_inherits inh WHERE inh.inhrelid = cls.oid + ) AS is_inherited, + -- Options (with defaults per index type) + substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int AS fillfactor, + substring(array_to_string(cls.reloptions, ',') FROM 'deduplicate_items=([a-z]*)')::boolean AS deduplicate_items, + substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int AS gin_pending_list_limit, + substring(array_to_string(cls.reloptions, ',') FROM 'pages_per_range=([0-9]*)')::int AS pages_per_range, + substring(array_to_string(cls.reloptions, ',') FROM 'buffering=([a-z]*)') AS buffering, + substring(array_to_string(cls.reloptions, ',') FROM 'fastupdate=([a-z]*)') AS fastupdate, + substring(array_to_string(cls.reloptions, ',') FROM 'autosummarize=([a-z]*)')::boolean AS autosummarize, + substring(array_to_string(cls.reloptions, ',') FROM 'lists=([0-9]*)')::int AS lists + {% if datlastsysoid %} + , (cls.oid <= {{ datlastsysoid }}::oid) AS is_sys_idx + {% endif %} FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - LEFT OUTER JOIN pg_catalog.pg_tablespace ta on ta.oid=cls.reltablespace - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - JOIN pg_catalog.pg_am am ON am.oid=cls.relam - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=cls.oid AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0 AND desp.classoid='pg_constraint'::regclass) -WHERE indrelid = {{tid}}::OID -{% if not show_sys_objects %} - AND conname is NULL -{% endif %} - {% if idx %}AND cls.oid = {{idx}}::OID {% endif %} - ORDER BY cls.relname + JOIN pg_catalog.pg_class cls ON cls.oid = idx.indexrelid + JOIN pg_catalog.pg_class tab ON tab.oid = idx.indrelid + LEFT JOIN pg_catalog.pg_tablespace ta ON ta.oid = cls.reltablespace + JOIN pg_catalog.pg_namespace n ON n.oid = tab.relnamespace + JOIN pg_catalog.pg_am am ON am.oid = cls.relam + LEFT JOIN pg_catalog.pg_depend dep ON dep.classid = cls.tableoid + AND dep.objid = cls.oid + AND dep.refobjsubid = 0 + AND dep.refclassid = (SELECT oid FROM pg_catalog.pg_class WHERE relname = 'pg_constraint') + AND dep.deptype = 'i' + LEFT JOIN pg_catalog.pg_constraint con ON con.tableoid = dep.refclassid AND con.oid = dep.refobjid + LEFT JOIN pg_catalog.pg_description des ON des.objoid = cls.oid AND des.classoid = 'pg_class'::regclass + LEFT JOIN pg_catalog.pg_description desp ON desp.objoid = con.oid AND desp.objsubid = 0 AND desp.classoid = 'pg_constraint'::regclass +WHERE idx.indrelid = {{ tid }}::OID + {% if not show_sys_objects %} + AND con.conname IS NULL + {% endif %} + {% if idx %} + AND cls.oid = {{ idx }}::OID + {% endif %} +ORDER BY cls.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/update.sql index bef61d07f1d..25fe327978a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/update.sql @@ -94,3 +94,17 @@ ALTER INDEX IF EXISTS {{conn|qtIdent(data.schema, data.name)}} {% endfor %} {% endif %} +{% set old_exts = (o_data.dependsonextensions or []) | list %} +{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} +{% if new_exts is not none and old_exts != new_exts %} +{% for ext in (old_exts + new_exts) | unique %} + +{% if ext in new_exts and ext not in old_exts %} +ALTER INDEX {{ conn|qtIdent(data.schema, data.name) }} + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% elif ext in old_exts and ext not in new_exts %} +ALTER INDEX {{ conn|qtIdent(data.schema, data.name) }} + NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endif %} +{% endfor %} +{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/11_plus/partition_diff.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/11_plus/partition_diff.sql deleted file mode 100644 index ab65e87fb33..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/11_plus/partition_diff.sql +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.name)}} ( - LIKE {{conn|qtIdent(data.schema, data.orig_name)}} INCLUDING ALL -) PARTITION BY {{ data.partition_scheme }}; -{{partition_sql}}{{partition_data.default_partition_header}} -CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.default_partition_name)}} PARTITION OF {{conn|qtIdent(data.schema, data.name)}} DEFAULT; - -INSERT INTO {{conn|qtIdent(data.schema, data.name)}}( -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} {{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}) -SELECT {% if data.columns and data.columns|length > 0 %}{% for c in data.columns %}{{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} - FROM {{conn|qtIdent(data.schema, data.orig_name)}}; - -{% if partition_data.partitions and partition_data.partitions|length > 0 %} -{% for part in partition_data.partitions %} -DROP TABLE IF EXISTS {{conn|qtIdent(data.schema, part.partition_name)}}; - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, part.temp_partition_name)}} - RENAME TO {{conn|qtIdent(part.partition_name)}}; - -{% endfor %}{% endif %} -DROP TABLE IF EXISTS {{conn|qtIdent(data.schema, data.orig_name)}}; - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RENAME TO {{data.orig_name}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/create.sql deleted file mode 100644 index 77f5064c443..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/create.sql +++ /dev/null @@ -1,74 +0,0 @@ -{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} -{#===========================================#} -{#====== MAIN TABLE TEMPLATE STARTS HERE ======#} -{#===========================================#} -{### CREATE TABLE STATEMENT FOR partitions ###} - -CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{conn|qtIdent(data.schema, data.name)}}{% if data.relispartition is defined and data.relispartition %} PARTITION OF {{conn|qtIdent(data.parent_schema, data.partitioned_table_name)}}{% endif %} - -{# Macro to render for constraints #} -{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} -( {% endif %} -{% if data.primary_key|length > 0 %}{{CONSTRAINTS.PRIMARY_KEY(conn, data.primary_key[0])}}{% endif %}{% if data.unique_constraint|length > 0 %}{% if data.primary_key|length > 0 %},{% endif %} -{{CONSTRAINTS.UNIQUE(conn, data.unique_constraint)}}{% endif %}{% if data.foreign_key|length > 0 %}{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.FOREIGN_KEY(conn, data.foreign_key)}}{% endif %}{% if data.check_constraint|length > 0 %}{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 %},{% endif %} -{{CONSTRAINTS.CHECK(conn, data.check_constraint)}}{% endif %}{% if data.exclude_constraint|length > 0 %}{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.EXCLUDE(conn, data.exclude_constraint)}}{% endif %} -{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} - -) -{% endif %} - {{ data.partition_value }}{% if data.is_partitioned is defined and data.is_partitioned %} - - PARTITION BY {{ data.partition_scheme }}{% endif %} -{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} - -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} - -USING {{data.amname}} -{% endif %} -{% if data.fillfactor or data.autovacuum_custom or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum or data.toast_autovacuum_enabled in ('t', 'f') or (data.autovacuum_enabled in ('t', 'f') and data.vacuum_table|length > 0) or (data.toast_autovacuum_enabled in ('t', 'f') and data.vacuum_toast|length > 0) %} -{% set ns = namespace(add_comma=false) %} - -WITH ( -{% if data.fillfactor %}{% set ns.add_comma = true%} - FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %} -{% if data.autovacuum_custom and data.vacuum_table|length > 0 %} -{% for opt in data.vacuum_table %}{% if opt.name and opt.value is defined %} -{% if ns.add_comma %}, -{% endif %} - {{opt.name}} = {{opt.value}}{% endif %}{% if opt.name and opt.value is defined %}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %} -{% if data.toast_autovacuum and data.vacuum_toast|length > 0 %} -{% for opt in data.vacuum_toast %}{% if opt.name and opt.value is defined %} -, - toast.{{opt.name}} = {{opt.value}}{% endif %}{% if opt.name and opt.value is defined %}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %} - -){% endif %} -{### SQL for Tablespace ###} -{% if data.spcname %} - -TABLESPACE {{ conn|qtIdent(data.spcname) }}; -{% else %} -; - -{% endif %} -{### Alter SQL for Owner ###} -{% if data.relowner %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER to {{conn|qtIdent(data.relowner)}}; -{% endif %} -{### SQL for COMMENT ###} -{% if data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/nodes.sql deleted file mode 100644 index ec1d4ff0212..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/nodes.sql +++ /dev/null @@ -1,55 +0,0 @@ -SELECT rel.oid, rel.relname AS name, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE AND tgenabled = 'O') AS has_enable_triggers, - pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value, - rel.relnamespace AS schema_id, - nsp.nspname AS schema_name, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_sub_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS sub_partition_scheme, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, am.amname -FROM - (SELECT * FROM pg_catalog.pg_inherits WHERE inhparent = {{ tid }}::oid) inh - LEFT JOIN pg_catalog.pg_class rel ON inh.inhrelid = rel.oid - LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - WHERE rel.relispartition - {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql deleted file mode 100644 index c46854f1106..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/12_plus/properties.sql +++ /dev/null @@ -1,77 +0,0 @@ -SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as parent_schema, - nsp.nspname as schema, - pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relispartition, - rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, - EXISTS(select 1 FROM pg_catalog.pg_trigger - JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' - JOIN pg_catalog.pg_proc pc ON pc.pronamespace=pt.pronamespace AND pc.proname='slonyversion' - WHERE tgrelid=rel.oid) AS isrepl, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT ARRAY(SELECT CASE WHEN (nspname NOT LIKE 'pg\_%') THEN - pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(c.relname) - ELSE pg_catalog.quote_ident(c.relname) END AS inherited_tables - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid ORDER BY inhseqno)) AS coll_inherits, - (SELECT count(*) - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid) AS inherited_tables_cnt, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, am.amname, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname, - (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels, - (CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table, - -- Added for partition table - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, - {% if ptid %} - (CASE WHEN rel.relispartition THEN pg_catalog.pg_get_expr(rel.relpartbound, {{ ptid }}::oid) ELSE '' END) AS partition_value, - (SELECT relname FROM pg_catalog.pg_class WHERE oid = {{ tid }}::oid) AS partitioned_table_name - {% else %} - pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value - {% endif %} - -FROM pg_catalog.pg_class rel - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - LEFT JOIN pg_catalog.pg_inherits inh ON inh.inhrelid = rel.oid - LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid -WHERE rel.relispartition AND inh.inhparent = {{ tid }}::oid -{% if ptid %} AND rel.oid = {{ ptid }}::oid {% endif %} -ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/14_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/14_plus/nodes.sql deleted file mode 100644 index 01f90b66a3b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/14_plus/nodes.sql +++ /dev/null @@ -1,55 +0,0 @@ -SELECT rel.oid, rel.relname AS name, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE AND tgenabled = 'O') AS has_enable_triggers, - pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value, - rel.relnamespace AS schema_id, - nsp.nspname AS schema_name, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_sub_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS sub_partition_scheme, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, inh.inhdetachpending, am.amname -FROM - (SELECT * FROM pg_catalog.pg_inherits WHERE inhparent = {{ tid }}::oid) inh - LEFT JOIN pg_catalog.pg_class rel ON inh.inhrelid = rel.oid - LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - WHERE rel.relispartition - {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/create.sql index f39edda7202..77f5064c443 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/create.sql @@ -21,6 +21,13 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {{ data.partition_value }}{% if data.is_partitioned is defined and data.is_partitioned %} PARTITION BY {{ data.partition_scheme }}{% endif %} +{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} + +USING {{data.amname}} +{% elif not data.default_amname and data.amname %} + +USING {{data.amname}} +{% endif %} {% if data.fillfactor or data.autovacuum_custom or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum or data.toast_autovacuum_enabled in ('t', 'f') or (data.autovacuum_enabled in ('t', 'f') and data.vacuum_table|length > 0) or (data.toast_autovacuum_enabled in ('t', 'f') and data.vacuum_toast|length > 0) %} {% set ns = namespace(add_comma=false) %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/nodes.sql index 9e60f9f8605..01f90b66a3b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/nodes.sql @@ -36,7 +36,7 @@ SELECT rel.oid, rel.relname AS name, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner + typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, inh.inhdetachpending, am.amname FROM (SELECT * FROM pg_catalog.pg_inherits WHERE inhparent = {{ tid }}::oid) inh LEFT JOIN pg_catalog.pg_class rel ON inh.inhrelid = rel.oid @@ -44,6 +44,7 @@ FROM LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace + LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid WHERE rel.relispartition {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/partition_diff.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/partition_diff.sql index 7cbf95733c8..ab65e87fb33 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/partition_diff.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/partition_diff.sql @@ -1,7 +1,9 @@ CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.name)}} ( LIKE {{conn|qtIdent(data.schema, data.orig_name)}} INCLUDING ALL ) PARTITION BY {{ data.partition_scheme }}; -{{partition_sql}} +{{partition_sql}}{{partition_data.default_partition_header}} +CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.default_partition_name)}} PARTITION OF {{conn|qtIdent(data.schema, data.name)}} DEFAULT; + INSERT INTO {{conn|qtIdent(data.schema, data.name)}}( {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/properties.sql index c1365a2ae71..c46854f1106 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/default/properties.sql @@ -1,12 +1,12 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE + (CASE WHEN length(spc.spcname::text) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE (SELECT sp.spcname FROM pg_catalog.pg_database dtb JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid WHERE dtb.oid = {{ did }}::oid) END) as spcname, (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as parent_schema, nsp.nspname as schema, - pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relhasoids, rel.relispartition, + pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relispartition, rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, EXISTS(select 1 FROM pg_catalog.pg_trigger JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' @@ -48,7 +48,8 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, + typ.typrelid AS typoid, am.amname, + (SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname, (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels, (CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table, @@ -67,6 +68,7 @@ FROM pg_catalog.pg_class rel LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid + LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid LEFT JOIN pg_catalog.pg_inherits inh ON inh.inhrelid = rel.oid LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/11_plus/partition_diff.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/11_plus/partition_diff.sql deleted file mode 100644 index bfc063c0f79..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/11_plus/partition_diff.sql +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE {{conn|qtIdent(data.schema, data.name)}} ( - LIKE {{conn|qtIdent(data.schema, data.orig_name)}} INCLUDING ALL -) PARTITION BY {{ data.partition_scheme }}; -{{partition_sql}}{{partition_data.default_partition_header}} -CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.default_partition_name)}} PARTITION OF {{conn|qtIdent(data.schema, data.name)}} DEFAULT; - -INSERT INTO {{conn|qtIdent(data.schema, data.name)}}( -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} {{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}) -SELECT {% if data.columns and data.columns|length > 0 %}{% for c in data.columns %}{{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %} - FROM {{conn|qtIdent(data.schema, data.orig_name)}}; - -{% if partition_data.partitions and partition_data.partitions|length > 0 %} -{% for part in partition_data.partitions %} -DROP TABLE IF EXISTS {{conn|qtIdent(data.schema, part.partition_name)}}; - -ALTER TABLE {{conn|qtIdent(data.schema, part.temp_partition_name)}} - RENAME TO {{conn|qtIdent(part.partition_name)}}; - -{% endfor %}{% endif %} -DROP TABLE {{conn|qtIdent(data.schema, data.orig_name)}}; - -ALTER TABLE {{conn|qtIdent(data.schema, data.name)}} - RENAME TO {{data.orig_name}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/create.sql deleted file mode 100644 index d837366f0ff..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/create.sql +++ /dev/null @@ -1,72 +0,0 @@ -{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} -{#===========================================#} -{#====== MAIN TABLE TEMPLATE STARTS HERE ======#} -{#===========================================#} -{### CREATE TABLE STATEMENT FOR partitions ###} -CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.name)}}{% if data.relispartition is defined and data.relispartition %} PARTITION OF {{conn|qtIdent(data.parent_schema, data.partitioned_table_name)}}{% endif %} - -{# Macro to render for constraints #} -{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} -( {% endif %} -{% if data.primary_key|length > 0 %}{{CONSTRAINTS.PRIMARY_KEY(conn, data.primary_key[0])}}{% endif %}{% if data.unique_constraint|length > 0 %}{% if data.primary_key|length > 0 %},{% endif %} -{{CONSTRAINTS.UNIQUE(conn, data.unique_constraint)}}{% endif %}{% if data.foreign_key|length > 0 %}{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.FOREIGN_KEY(conn, data.foreign_key)}}{% endif %}{% if data.check_constraint|length > 0 %}{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 %},{% endif %} -{{CONSTRAINTS.CHECK(conn, data.check_constraint)}}{% endif %}{% if data.exclude_constraint|length > 0 %}{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.EXCLUDE(conn, data.exclude_constraint)}}{% endif %} -{% if data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} - -) -{% endif %} - {{ data.partition_value }}{% if data.is_partitioned is defined and data.is_partitioned %} - - PARTITION BY {{ data.partition_scheme }}{% endif %} -{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} - -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} - -USING {{data.amname}} -{% endif %} -{% if data.fillfactor or data.autovacuum_custom or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum or data.toast_autovacuum_enabled in ('t', 'f') or (data.autovacuum_enabled in ('t', 'f') and data.vacuum_table|length > 0) or (data.toast_autovacuum_enabled in ('t', 'f') and data.vacuum_toast|length > 0) %} -{% set ns = namespace(add_comma=false) %} - -WITH ( -{% if data.fillfactor %}{% set ns.add_comma = true%} - FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %} -{% if data.autovacuum_custom and data.vacuum_table|length > 0 %} -{% for opt in data.vacuum_table %}{% if opt.name and opt.value is defined %} -{% if ns.add_comma %}, -{% endif %} - {{opt.name}} = {{opt.value}}{% endif %}{% if opt.name and opt.value is defined %}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %}{% if data.toast_autovacuum and data.vacuum_toast|length > 0 %} -{% for opt in data.vacuum_toast %}{% if opt.name and opt.value is defined %} -, - toast.{{opt.name}} = {{opt.value}}{% endif %} -{% endfor %}{% endif %} - -){% endif %} -{### SQL for Tablespace ###} -{% if data.spcname %} - -TABLESPACE {{ conn|qtIdent(data.spcname) }}; -{% else %} -; - -{% endif %} -{### Alter SQL for Owner ###} -{% if data.relowner %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER to {{conn|qtIdent(data.relowner)}}; -{% endif %} -{### SQL for COMMENT ###} -{% if data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/nodes.sql deleted file mode 100644 index ec1d4ff0212..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/nodes.sql +++ /dev/null @@ -1,55 +0,0 @@ -SELECT rel.oid, rel.relname AS name, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE AND tgenabled = 'O') AS has_enable_triggers, - pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value, - rel.relnamespace AS schema_id, - nsp.nspname AS schema_name, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_sub_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS sub_partition_scheme, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, am.amname -FROM - (SELECT * FROM pg_catalog.pg_inherits WHERE inhparent = {{ tid }}::oid) inh - LEFT JOIN pg_catalog.pg_class rel ON inh.inhrelid = rel.oid - LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - WHERE rel.relispartition - {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/properties.sql deleted file mode 100644 index e7ec8e3b271..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/12_plus/properties.sql +++ /dev/null @@ -1,77 +0,0 @@ -SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as parent_schema, - nsp.nspname as schema, - pg_get_userbyid(rel.relowner) AS relowner, rel.relispartition, - rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, - EXISTS(select 1 FROM pg_catalog.pg_trigger - JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' - JOIN pg_catalog.pg_proc pc ON pc.pronamespace=pt.pronamespace AND pc.proname='slonyversion' - WHERE tgrelid=rel.oid) AS isrepl, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT ARRAY(SELECT CASE WHEN (nspname NOT LIKE 'pg\_%') THEN - pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(c.relname) - ELSE pg_catalog.quote_ident(c.relname) END AS inherited_tables - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid ORDER BY inhseqno)) AS coll_inherits, - (SELECT count(*) - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid) AS inherited_tables_cnt, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, am.amname, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname, - (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels, - (CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table, - -- Added for partition table - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, - {% if ptid %} - (CASE WHEN rel.relispartition THEN pg_catalog.pg_get_expr(rel.relpartbound, {{ ptid }}::oid) ELSE '' END) AS partition_value, - (SELECT relname FROM pg_catalog.pg_class WHERE oid = {{ tid }}::oid) AS partitioned_table_name - {% else %} - pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value - {% endif %} - -FROM pg_catalog.pg_class rel - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - LEFT JOIN pg_catalog.pg_inherits inh ON inh.inhrelid = rel.oid - LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid -WHERE rel.relispartition AND inh.inhparent = {{ tid }}::oid -{% if ptid %} AND rel.oid = {{ ptid }}::oid {% endif %} -ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/14_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/14_plus/nodes.sql deleted file mode 100644 index 01f90b66a3b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/14_plus/nodes.sql +++ /dev/null @@ -1,55 +0,0 @@ -SELECT rel.oid, rel.relname AS name, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE AND tgenabled = 'O') AS has_enable_triggers, - pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value, - rel.relnamespace AS schema_id, - nsp.nspname AS schema_name, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_sub_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, - (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS sub_partition_scheme, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, inh.inhdetachpending, am.amname -FROM - (SELECT * FROM pg_catalog.pg_inherits WHERE inhparent = {{ tid }}::oid) inh - LEFT JOIN pg_catalog.pg_class rel ON inh.inhrelid = rel.oid - LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - WHERE rel.relispartition - {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = rel.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/create.sql index d54e98d2ec4..d837366f0ff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/create.sql @@ -20,6 +20,13 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE IF NOT EXISTS {{con {{ data.partition_value }}{% if data.is_partitioned is defined and data.is_partitioned %} PARTITION BY {{ data.partition_scheme }}{% endif %} +{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} + +USING {{data.amname}} +{% elif not data.default_amname and data.amname %} + +USING {{data.amname}} +{% endif %} {% if data.fillfactor or data.autovacuum_custom or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum or data.toast_autovacuum_enabled in ('t', 'f') or (data.autovacuum_enabled in ('t', 'f') and data.vacuum_table|length > 0) or (data.toast_autovacuum_enabled in ('t', 'f') and data.vacuum_toast|length > 0) %} {% set ns = namespace(add_comma=false) %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/nodes.sql index 9e60f9f8605..01f90b66a3b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/nodes.sql @@ -36,7 +36,7 @@ SELECT rel.oid, rel.relname AS name, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner + typ.typrelid AS typoid, des.description, pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, inh.inhdetachpending, am.amname FROM (SELECT * FROM pg_catalog.pg_inherits WHERE inhparent = {{ tid }}::oid) inh LEFT JOIN pg_catalog.pg_class rel ON inh.inhrelid = rel.oid @@ -44,6 +44,7 @@ FROM LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace + LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid WHERE rel.relispartition {% if ptid %} AND rel.oid = {{ ptid }}::OID {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/partition_diff.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/partition_diff.sql index 7cbf95733c8..bfc063c0f79 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/partition_diff.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/partition_diff.sql @@ -1,7 +1,9 @@ -CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.name)}} ( +CREATE TABLE {{conn|qtIdent(data.schema, data.name)}} ( LIKE {{conn|qtIdent(data.schema, data.orig_name)}} INCLUDING ALL ) PARTITION BY {{ data.partition_scheme }}; -{{partition_sql}} +{{partition_sql}}{{partition_data.default_partition_header}} +CREATE TABLE IF NOT EXISTS {{conn|qtIdent(data.schema, data.default_partition_name)}} PARTITION OF {{conn|qtIdent(data.schema, data.name)}} DEFAULT; + INSERT INTO {{conn|qtIdent(data.schema, data.name)}}( {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {{c.name}}{% if not loop.last %},{% endif %}{% endfor %}{% endif %}) @@ -12,11 +14,11 @@ SELECT {% if data.columns and data.columns|length > 0 %}{% for c in data.columns {% for part in partition_data.partitions %} DROP TABLE IF EXISTS {{conn|qtIdent(data.schema, part.partition_name)}}; -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, part.temp_partition_name)}} +ALTER TABLE {{conn|qtIdent(data.schema, part.temp_partition_name)}} RENAME TO {{conn|qtIdent(part.partition_name)}}; {% endfor %}{% endif %} -DROP TABLE IF EXISTS {{conn|qtIdent(data.schema, data.orig_name)}}; +DROP TABLE {{conn|qtIdent(data.schema, data.orig_name)}}; -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} +ALTER TABLE {{conn|qtIdent(data.schema, data.name)}} RENAME TO {{data.orig_name}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/properties.sql index 1799b6b92fc..e7ec8e3b271 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/default/properties.sql @@ -1,12 +1,12 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE + (CASE WHEN length(spc.spcname::text) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE (SELECT sp.spcname FROM pg_catalog.pg_database dtb JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid WHERE dtb.oid = {{ did }}::oid) END) as spcname, (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as parent_schema, nsp.nspname as schema, - pg_get_userbyid(rel.relowner) AS relowner, rel.relhasoids, rel.relispartition, + pg_get_userbyid(rel.relowner) AS relowner, rel.relispartition, rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, EXISTS(select 1 FROM pg_catalog.pg_trigger JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' @@ -48,18 +48,19 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, typ.typname, - typ.typrelid AS typoid, + typ.typrelid AS typoid, am.amname, + (SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname, (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels, (CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table, -- Added for partition table (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - (CASE WHEN rel.relkind = 'p' THEN pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, + (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef(rel.oid::oid) ELSE '' END) AS partition_scheme, {% if ptid %} - (CASE WHEN rel.relispartition THEN pg_get_expr(rel.relpartbound, {{ ptid }}::oid) ELSE '' END) AS partition_value, + (CASE WHEN rel.relispartition THEN pg_catalog.pg_get_expr(rel.relpartbound, {{ ptid }}::oid) ELSE '' END) AS partition_value, (SELECT relname FROM pg_catalog.pg_class WHERE oid = {{ tid }}::oid) AS partitioned_table_name {% else %} - pg_get_expr(rel.relpartbound, rel.oid) AS partition_value + pg_catalog.pg_get_expr(rel.relpartbound, rel.oid) AS partition_value {% endif %} FROM pg_catalog.pg_class rel @@ -67,6 +68,7 @@ FROM pg_catalog.pg_class rel LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid + LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid LEFT JOIN pg_catalog.pg_inherits inh ON inh.inhrelid = rel.oid LEFT JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql deleted file mode 100644 index 9c8f31bc518..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/create.sql +++ /dev/null @@ -1,219 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{% 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 ======#} -{#===========================================#} -{# - If user has not provided any details but only name then - add empty bracket with table name -#} -{% set empty_bracket = ""%} -{% if data.coll_inherits|length == 0 and data.columns|length == 0 and not data.typname and not data.like_relation and data.primary_key|length == 0 and data.unique_constraint|length == 0 and data.foreign_key|length == 0 and data.check_constraint|length == 0 and data.exclude_constraint|length == 0 %} -{% set empty_bracket = "\n(\n)"%} -{% endif %} -CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{conn|qtIdent(data.schema, data.name)}}{{empty_bracket}} -{% if data.typname %} - OF {{ data.typname }} -{% endif %} -{% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} -( -{% endif %} -{% if data.like_relation %} - LIKE {{ data.like_relation }}{% if data.like_default_value %} - - INCLUDING DEFAULTS{% endif %}{% if data.like_constraints %} - - INCLUDING CONSTRAINTS{% endif %}{% if data.like_indexes %} - - INCLUDING INDEXES{% endif %}{% if data.like_storage %} - - INCLUDING STORAGE{% endif %}{% if data.like_comments %} - - INCLUDING COMMENTS{% endif %}{% if data.like_identity %} - - INCLUDING IDENTITY{% endif %}{% if data.like_statistics %} - - INCLUDING STATISTICS{% endif %}{% if data.columns|length > 0 %}, -{% endif %} - -{% endif %} -{### Add columns ###} -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} -{% if c.name and c.cltype %} - {% if c.inheritedfromtype and c.has_with_options %}{# Use WITH OPTIONS syntax for modified OF TYPE columns #}{{conn|qtIdent(c.name)}} WITH OPTIONS{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %}{% elif c.inheritedfromtable %}{# Inherited from parent table - keep as comment #}-- Inherited from table {{c.inheritedfromtable}}: {{conn|qtIdent(c.name)}}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %}{% else %}{# Regular column or inherited without modifications #}{% if c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.geometry and not is_sql %}({{c.geometry}}{% if c.srid %},{{c.srid}}{% endif %}){% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %}{% endif %} -{% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} -{% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} -{% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} -{% if c.seqcycle is defined and c.seqcycle %} -CYCLE {% endif %}{% if c.seqincrement is defined and c.seqincrement|int(-1) > -1 %} -INCREMENT {{c.seqincrement|int}} {% endif %}{% if c.seqstart is defined and c.seqstart|int(-1) > -1%} -START {{c.seqstart|int}} {% endif %}{% if c.seqmin is defined and c.seqmin|int(-1) > -1%} -MINVALUE {{c.seqmin|int}} {% endif %}{% if c.seqmax is defined and c.seqmax|int(-1) > -1%} -MAXVALUE {{c.seqmax|int}} {% endif %}{% if c.seqcache is defined and c.seqcache|int(-1) > -1%} -CACHE {{c.seqcache|int}} {% endif %} -{% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %}){% endif %} -{% endif %} -{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} -{# Macro to render for constraints #} -{% if data.primary_key|length > 0 %}{% if data.columns|length > 0 %},{% endif %} -{{CONSTRAINTS.PRIMARY_KEY(conn, data.primary_key[0])}}{% endif %}{% if data.unique_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 %},{% endif %} -{{CONSTRAINTS.UNIQUE(conn, data.unique_constraint)}}{% endif %}{% if data.foreign_key|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.FOREIGN_KEY(conn, data.foreign_key)}}{% endif %}{% if data.check_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 %},{% endif %} -{{CONSTRAINTS.CHECK(conn, data.check_constraint)}}{% endif %}{% if data.exclude_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.EXCLUDE(conn, data.exclude_constraint)}}{% endif %} -{% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} - -){% endif %}{% if data.relkind is defined and data.relkind == 'p' %} PARTITION BY {{ data.partition_scheme }}{% endif %} - -{### If we are inheriting it from another table(s) ###} -{% if data.coll_inherits %} - INHERITS ({% for val in data.coll_inherits %}{% if loop.index != 1 %}, {% endif %}{{val}}{% endfor %}) -{% endif %} -WITH ( - OIDS = {% if data.relhasoids %}TRUE{% else %}FALSE{% endif %}{% if data.fillfactor %}, - FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.parallel_workers is defined and data.parallel_workers != '' and data.parallel_workers != None %}, - parallel_workers = {{ data.parallel_workers }}{% endif %}{% if data.toast_tuple_target is defined and data.toast_tuple_target != '' and data.toast_tuple_target != None %}, - toast_tuple_target = {{ data.toast_tuple_target }}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %}, - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %}, - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %} -{% endif %}{% if data.autovacuum_custom and data.vacuum_table|length > 0 %} -{% for opt in data.vacuum_table %}{% if opt.name and opt.value is defined %} -, - {{opt.name}} = {{opt.value}}{% endif %} -{% endfor %}{% endif %}{% if data.toast_autovacuum and data.vacuum_toast|length > 0 %} -{% for opt in data.vacuum_toast %}{% if opt.name and opt.value is defined %} -, - toast.{{opt.name}} = {{opt.value}}{% endif %} -{% endfor %}{% endif %} - -{### SQL for Tablespace ###} -{% if data.spcname %} -) -TABLESPACE {{ conn|qtIdent(data.spcname) }}; -{% else %} -); -{% endif %} -{### Alter SQL for Owner ###} -{% if data.relowner %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER to {{conn|qtIdent(data.relowner)}}; -{% endif %} - -{#####################################################} -{## Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.rlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ENABLE ROW LEVEL SECURITY; -{% endif %} - -{#####################################################} -{## Force Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.forcerlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - FORCE ROW LEVEL SECURITY; -{% endif %} - -{### Security Labels on Table ###} -{% if data.seclabels and data.seclabels|length > 0 %} - -{% for r in data.seclabels %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{### ACL on Table ###} -{% if data.revoke_all %} -{% for priv in data.revoke_all %} -{{ PRIVILEGE.UNSETALL(conn, "TABLE", priv, data.name, data.schema)}} -{% endfor %} -{% endif %} -{% if data.relacl %} - -{% for priv in data.relacl %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{### SQL for COMMENT ###} -{% if data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{#===========================================#} -{#====== MAIN TABLE TEMPLATE ENDS HERE ======#} -{#===========================================#} -{#===========================================#} -{# COLUMN SPECIFIC TEMPLATES STARTS HERE #} -{#===========================================#} -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} -{### Set default value for inherited columns ###} -{% if c.inheritedfromtable and c.defval is defined and c.defval is not none and c.defval != '' %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET DEFAULT {{c.defval}}; - -{% endif %} -{% if c.description %} - -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} - IS {{c.description|qtLiteral(conn)}}; -{% endif %} -{### Add variables to column ###} -{% if c.attoptions and c.attoptions|length > 0 %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - {{ VARIABLE.SET(conn, 'COLUMN', c.name, c.attoptions) }} - -{% endif %} -{### Alter column statistics value ###} -{% if c.attstattarget is defined and c.attstattarget is not none and c.attstattarget > -1 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STATISTICS {{c.attstattarget}}; - -{% endif %} -{### Alter column storage value ###} -{% if c.attstorage is defined and c.attstorage != c.defaultstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STORAGE {%if c.attstorage == 'p' %} -PLAIN{% elif c.attstorage == 'm'%}MAIN{% elif c.attstorage == 'e'%} -EXTERNAL{% elif c.attstorage == 'x'%}EXTENDED{% endif %}; - -{% endif %} -{### ACL ###} -{% if c.attacl and c.attacl|length > 0 %} - -{% for priv in c.attacl %} -{{ COLUMN_PRIVILEGE.APPLY(conn, data.schema, data.name, c.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if c.seclabels and c.seclabels|length > 0 %} - -{% for r in c.seclabels %} -{{ COLUMN_SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.name, c.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% endfor %} -{% endif %} -{#===========================================#} -{# COLUMN SPECIFIC TEMPLATES ENDS HERE #} -{#===========================================#} -{#======================================#} -{# CONSTRAINTS SPECIFIC TEMPLATES #} -{#======================================#} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.primary_key)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.unique_constraint)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.foreign_key)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.check_constraint)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.exclude_constraint)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/properties.sql deleted file mode 100644 index 151bd9be616..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/properties.sql +++ /dev/null @@ -1,75 +0,0 @@ -SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - (CASE rel.relreplident - WHEN 'd' THEN 'default' - WHEN 'n' THEN 'nothing' - WHEN 'f' THEN 'full' - WHEN 'i' THEN 'index' - END) as replica_identity, - (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as schema, - pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relhasoids, rel.relkind, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, - EXISTS(select 1 FROM pg_catalog.pg_trigger - JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' - JOIN pg_catalog.pg_proc pc ON pc.pronamespace=pt.pronamespace AND pc.proname='slonyversion' - WHERE tgrelid=rel.oid) AS isrepl, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT ARRAY(SELECT CASE WHEN (nspname NOT LIKE 'pg\_%') THEN - pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(c.relname) - ELSE pg_catalog.quote_ident(c.relname) END AS inherited_tables - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid ORDER BY inhseqno)) AS coll_inherits, - (SELECT count(*) - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid) AS inherited_tables_cnt, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'parallel_workers=([0-9]*)') AS parallel_workers, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'toast_tuple_target=([0-9]*)') AS toast_tuple_target, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, - CASE WHEN typ.typname IS NOT NULL THEN (select pg_catalog.quote_ident(nspname) FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid )||'.'||pg_catalog.quote_ident(typ.typname) ELSE typ.typname END AS typname, - typ.typrelid AS typoid, rel.relrowsecurity as rlspolicy, rel.relforcerowsecurity as forcerlspolicy, - (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels, - (CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table - -- Added for partition table - {% if tid %}, (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef({{ tid }}::oid) ELSE '' END) AS partition_scheme {% endif %} -FROM pg_catalog.pg_class rel - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid -WHERE rel.relkind IN ('r','s','t','p') AND rel.relnamespace = {{ scid }}::oid -AND NOT rel.relispartition -{% if tid %} AND rel.oid = {{ tid }}::oid {% endif %} -ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/update.sql deleted file mode 100644 index 7dcad70b160..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/update.sql +++ /dev/null @@ -1,299 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{#####################################################} -{## Rename table ##} -{#####################################################} -{% if data.name and data.name != o_data.name %} -ALTER TABLE IF EXISTS {{conn|qtIdent(o_data.schema, o_data.name)}} - RENAME TO {{conn|qtIdent(data.name)}}; - -{% endif %} -{#####################################################} -{## Change table schema ##} -{#####################################################} -{% if data.schema and data.schema != o_data.schema %} -ALTER TABLE IF EXISTS {{conn|qtIdent(o_data.schema, data.name)}} - SET SCHEMA {{conn|qtIdent(data.schema)}}; - -{% endif %} -{#####################################################} -{## Change table owner ##} -{#####################################################} -{% if data.relowner and data.relowner != o_data.relowner %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER TO {{conn|qtIdent(data.relowner)}}; - -{% endif %} -{#####################################################} -{## Update Inherits table definition ##} -{#####################################################} -{% if data.coll_inherits_added|length > 0 %} -{% for val in data.coll_inherits_added %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - INHERIT {{val}}; - -{% endfor %} -{% endif %} -{% if data.coll_inherits_removed|length > 0 %} -{% for val in data.coll_inherits_removed %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - NO INHERIT {{val}}; - -{% endfor %} -{% endif %} -{#####################################################} -{## Change hasOID attribute of table ##} -{#####################################################} -{% if data.relhasoids is defined and data.relhasoids != o_data.relhasoids %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET {% if data.relhasoids %}WITH{% else %}WITHOUT{% endif %} OIDS; - -{% endif %} -{#####################################################} -{## Change table persistence (UNLOGGED / LOGGED) ##} -{#####################################################} -{% if data.relpersistence is defined and data.relpersistence != o_data.relpersistence %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET {% if data.relpersistence %}UNLOGGED{% else %}LOGGED{% endif %}; - -{% endif %} -{#####################################################} -{## Change tablespace ##} -{#####################################################} -{% if data.spcname and data.spcname != o_data.spcname %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET TABLESPACE {{conn|qtIdent(data.spcname)}}; - -{% endif %} -{#####################################################} -{## change fillfactor settings ##} -{#####################################################} -{% if data.fillfactor and data.fillfactor != o_data.fillfactor %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (FILLFACTOR={{data.fillfactor}}); -{% elif (data.fillfactor == '' or data.fillfactor == None) and data.fillfactor != o_data.fillfactor %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (FILLFACTOR); - -{% endif %} - -{## change parallel_workers settings ##} -{#####################################################} -{% if (data.parallel_workers == '' or data.parallel_workers == None) and data.parallel_workers != o_data.parallel_workers %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (parallel_workers); -{% elif data.parallel_workers is defined and data.parallel_workers != o_data.parallel_workers %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (parallel_workers={{data.parallel_workers}}); - -{% endif %} - -{## change toast_tuple_target settings ##} -{#####################################################} -{% if (data.toast_tuple_target == '' or data.toast_tuple_target == None) and data.toast_tuple_target != o_data.toast_tuple_target %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (toast_tuple_target); -{% elif data.toast_tuple_target is defined and data.toast_tuple_target != o_data.toast_tuple_target %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (toast_tuple_target={{data.toast_tuple_target}}); - -{% endif %} - -{###############################} -{## Table AutoVacuum settings ##} -{###############################} -{% if data.vacuum_table is defined and data.vacuum_table.set_values|length > 0 %} -{% set has_vacuum_set = true %} -{% endif %} -{% if data.vacuum_table is defined and data.vacuum_table.reset_values|length > 0 %} -{% set has_vacuum_reset = true %} -{% endif %} -{% if o_data.autovacuum_custom and data.autovacuum_custom == false %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( - autovacuum_enabled, - autovacuum_analyze_scale_factor, - autovacuum_analyze_threshold, - autovacuum_freeze_max_age, - autovacuum_vacuum_cost_delay, - autovacuum_vacuum_cost_limit, - autovacuum_vacuum_scale_factor, - autovacuum_vacuum_threshold, - autovacuum_freeze_min_age, - autovacuum_freeze_table_age -); -{% else %} -{% if (data.autovacuum_enabled in ('t', 'f') and data.autovacuum_enabled != o_data.autovacuum_enabled) or has_vacuum_set %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} SET ( -{% if data.autovacuum_enabled in ('t', 'f') and data.autovacuum_enabled != o_data.autovacuum_enabled %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if has_vacuum_set %}, -{% endif %} -{% endif %} -{% if has_vacuum_set %} -{% for opt in data.vacuum_table.set_values %}{% if opt.name and opt.value is defined %} - {{opt.name}} = {{opt.value}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% if (data.autovacuum_enabled == 'x' and data.autovacuum_enabled != o_data.autovacuum_enabled) or has_vacuum_reset %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( -{% if data.autovacuum_enabled =='x' and data.autovacuum_enabled != o_data.autovacuum_enabled %} - autovacuum_enabled{% if has_vacuum_reset %}, -{% endif %} -{% endif %} -{% if has_vacuum_reset %} -{% for opt in data.vacuum_table.reset_values %}{% if opt.name %} - {{opt.name}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% endif %} -{#####################################} -{## Toast table AutoVacuum settings ##} -{#####################################} -{% if data.vacuum_toast is defined and data.vacuum_toast.set_values|length > 0 %} -{% set has_vacuum_toast_set = true %} -{% endif %} -{% if data.vacuum_toast is defined and data.vacuum_toast.reset_values|length > 0 %} -{% set has_vacuum_toast_reset = true %} -{% endif %} -{% if o_data.toast_autovacuum and data.toast_autovacuum == false %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( - toast.autovacuum_enabled, - toast.autovacuum_freeze_max_age, - toast.autovacuum_vacuum_cost_delay, - toast.autovacuum_vacuum_cost_limit, - toast.autovacuum_vacuum_scale_factor, - toast.autovacuum_vacuum_threshold, - toast.autovacuum_freeze_min_age, - toast.autovacuum_freeze_table_age, - toast.autovacuum_analyze_threshold, - toast.autovacuum_analyze_scale_factor -); -{% else %} -{% if (data.toast_autovacuum_enabled in ('t', 'f') and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled) or has_vacuum_toast_set %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} SET ( -{% if data.toast_autovacuum_enabled in ('t', 'f') and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if has_vacuum_toast_set %}, -{% endif %} -{% endif %} -{% if has_vacuum_toast_set %} -{% for opt in data.vacuum_toast.set_values %}{% if opt.name and opt.value is defined %} - toast.{{opt.name}} = {{opt.value}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% if (data.toast_autovacuum_enabled == 'x' and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled) or has_vacuum_toast_reset %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( -{% if data.toast_autovacuum_enabled == 'x' and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled %} - toast.autovacuum_enabled{% if has_vacuum_toast_reset %}, -{% endif %} -{% endif %} -{% if has_vacuum_toast_reset %} -{% for opt in data.vacuum_toast.reset_values %}{% if opt.name %} - toast.{{opt.name}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% endif %} -{#####################################################} -{## Change table comments ##} -{#####################################################} -{% if data.description is defined and data.description != o_data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; - -{% endif %} - -{#####################################################} -{## Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.rlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ENABLE ROW LEVEL SECURITY; -{% elif data.rlspolicy is defined and data.rlspolicy != o_data.rlspolicy%} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - DISABLE ROW LEVEL SECURITY; - -{% endif %} - -{#####################################################} -{## Force Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.forcerlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - FORCE ROW LEVEL SECURITY; -{% elif data.forcerlspolicy is defined and data.forcerlspolicy != o_data.forcerlspolicy%} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - NO FORCE ROW LEVEL SECURITY; -{% endif %} - -{#####################################################} -{## Update table Privileges ##} -{#####################################################} -{% if data.relacl %} -{% if 'deleted' in data.relacl %} -{% for priv in data.relacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.relacl %} -{% for priv in data.relacl.changed %} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.old_grantee, data.name, data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in data.relacl %} -{% for priv in data.relacl.added %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{#####################################################} -{## Update table SecurityLabel ##} -{#####################################################} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'TABLE', data.name, r.provider, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} - -{% endif %} -{#####################################################} -{## Change replica identity ##} -{#####################################################} -{% if data.replica_identity and data.replica_identity != o_data.replica_identity %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} REPLICA IDENTITY {{data.replica_identity }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql deleted file mode 100644 index 32fe82c7243..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/create.sql +++ /dev/null @@ -1,245 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{% 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 ======#} -{#===========================================#} -{# - If user has not provided any details but only name then - add empty bracket with table name -#} -{% set empty_bracket = ""%} -{% if not (data.coll_inherits or data.columns or data.typname or data.like_relation or data.primary_key or data.unique_constraint or data.foreign_key or data.check_constraint or data.exclude_constraint) %} -{% set empty_bracket = "\n(\n)"%} -{% endif %} -{% set with_clause = false%} -{% if data.fillfactor or data.parallel_workers or data.toast_tuple_target or (data.autovacuum_custom and data.add_vacuum_settings_in_sql) or data.autovacuum_enabled in ('t', 'f') or (data.toast_autovacuum and data.add_vacuum_settings_in_sql) or data.toast_autovacuum_enabled in ('t', 'f') %} -{% set with_clause = true%} -{% endif %} -CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{conn|qtIdent(data.schema, data.name)}}{{empty_bracket}} -{% if data.typname %} - OF {{ data.typname }} -{% endif %} -{% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} -( -{% endif %} -{% if data.like_relation %} - LIKE {{ data.like_relation }}{% if data.like_default_value %} - - INCLUDING DEFAULTS{% endif %}{% if data.like_constraints %} - - INCLUDING CONSTRAINTS{% endif %}{% if data.like_indexes %} - - INCLUDING INDEXES{% endif %}{% if data.like_storage %} - - INCLUDING STORAGE{% endif %}{% if data.like_comments %} - - INCLUDING COMMENTS{% endif %}{% if data.like_generated %} - - INCLUDING GENERATED{% endif %}{% if data.like_identity %} - - INCLUDING IDENTITY{% endif %}{% if data.like_statistics %} - - INCLUDING STATISTICS{% endif %}{% if data.columns|length > 0 %}, -{% endif %} - -{% endif %} -{### Add columns ###} -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} -{% if c.name and c.cltype %} - {% if c.inheritedfromtype and c.has_with_options %}{# Use WITH OPTIONS syntax for modified OF TYPE columns #}{{conn|qtIdent(c.name)}} WITH OPTIONS{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% elif c.inheritedfromtable %}{# Inherited from parent table - keep as comment #}-- Inherited from table {{c.inheritedfromtable}}: {{conn|qtIdent(c.name)}}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% else %}{# Regular column or inherited without modifications #}{% if c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.geometry and not is_sql %}({{c.geometry}}{% if c.srid %},{{c.srid}}{% endif %}){% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% endif %} -{% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} -{% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} -{% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} -{% if c.seqcycle is defined and c.seqcycle %} -CYCLE {% endif %}{% if c.seqincrement is defined and c.seqincrement|int(-1) > -1 %} -INCREMENT {{c.seqincrement|int}} {% endif %}{% if c.seqstart is defined and c.seqstart|int(-1) > -1%} -START {{c.seqstart|int}} {% endif %}{% if c.seqmin is defined and c.seqmin|int(-1) > -1%} -MINVALUE {{c.seqmin|int}} {% endif %}{% if c.seqmax is defined and c.seqmax|int(-1) > -1%} -MAXVALUE {{c.seqmax|int}} {% endif %}{% if c.seqcache is defined and c.seqcache|int(-1) > -1%} -CACHE {{c.seqcache|int}} {% endif %} -{% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %}){% endif %} -{% endif %} -{% if c.colconstype == 'g' and c.genexpr and c.genexpr != '' %} GENERATED ALWAYS AS ({{c.genexpr}}) STORED{% endif %} -{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} -{# Macro to render for constraints #} -{% if data.primary_key|length > 0 %}{% if data.columns|length > 0 %},{% endif %} -{{CONSTRAINTS.PRIMARY_KEY(conn, data.primary_key[0])}}{% endif %}{% if data.unique_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 %},{% endif %} -{{CONSTRAINTS.UNIQUE(conn, data.unique_constraint)}}{% endif %}{% if data.foreign_key|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.FOREIGN_KEY(conn, data.foreign_key)}}{% endif %}{% if data.check_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 %},{% endif %} -{{CONSTRAINTS.CHECK(conn, data.check_constraint)}}{% endif %}{% if data.exclude_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.EXCLUDE(conn, data.exclude_constraint)}}{% endif %} -{% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} - -){% endif %}{% if data.relkind is defined and data.relkind == 'p' %} PARTITION BY {{ data.partition_scheme }}{% endif %} -{% if not data.coll_inherits and not data.spcname and not with_clause and not data.amname %};{% endif %} - -{### If we are inheriting it from another table(s) ###} -{% if data.coll_inherits %} - INHERITS ({% for val in data.coll_inherits %}{% if loop.index != 1 %}, {% endif %}{{val}}{% endfor %}){% if not data.spcname and not with_clause and not data.amname %};{% endif %} -{% endif %} - -{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} -USING {{data.amname}}{% if not data.spcname and not with_clause %};{% endif %} -{% endif %} - -{% if with_clause %} -{% set ns = namespace(add_comma=false) %} -WITH ( -{% if data.fillfactor %}{% set ns.add_comma = true%} - FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.parallel_workers %} -{% if ns.add_comma %}, -{% endif %} - parallel_workers = {{ data.parallel_workers }}{% set ns.add_comma = true%}{% endif %}{% if data.toast_tuple_target %} -{% if ns.add_comma %}, -{% endif %} - toast_tuple_target = {{ data.toast_tuple_target }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_custom %} -{% for opt in data.vacuum_table %}{% if opt.name and opt.value is defined %} -{% if ns.add_comma %}, -{% endif %} - {{opt.name}} = {{opt.value}}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %}{% if data.toast_autovacuum %} -{% for opt in data.vacuum_toast %}{% if opt.name and opt.value is defined %} -{% if ns.add_comma %}, -{% endif %} - toast.{{opt.name}} = {{opt.value}}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %} - -{% if data.spcname %}){% else %});{% endif %} - -{% endif %} -{### SQL for Tablespace ###} -{% if data.spcname %} -TABLESPACE {{ conn|qtIdent(data.spcname) }}; -{% endif %} -{### Alter SQL for Owner ###} -{% if data.relowner %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER to {{conn|qtIdent(data.relowner)}}; -{% endif %} - -{#####################################################} -{## Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.rlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ENABLE ROW LEVEL SECURITY; -{% endif %} - -{#####################################################} -{## Force Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.forcerlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - FORCE ROW LEVEL SECURITY; -{% endif %} - -{### Security Labels on Table ###} -{% if data.seclabels and data.seclabels|length > 0 %} - -{% for r in data.seclabels %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{### ACL on Table ###} -{% if data.revoke_all %} -{% for priv in data.revoke_all %} -{{ PRIVILEGE.UNSETALL(conn, "TABLE", priv, data.name, data.schema)}} -{% endfor %} -{% endif %} -{% if data.relacl %} - -{% for priv in data.relacl %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{### SQL for COMMENT ###} -{% if data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{#===========================================#} -{#====== MAIN TABLE TEMPLATE ENDS HERE ======#} -{#===========================================#} -{#===========================================#} -{# COLUMN SPECIFIC TEMPLATES STARTS HERE #} -{#===========================================#} -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} -{### Set default value for inherited columns ###} -{% if c.inheritedfromtable and c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET DEFAULT {{c.defval}}; - -{% endif %} -{% if c.description %} - -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} - IS {{c.description|qtLiteral(conn)}}; -{% endif %} -{### Add variables to column ###} -{% if c.attoptions and c.attoptions|length > 0 %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - {{ VARIABLE.SET(conn, 'COLUMN', c.name, c.attoptions) }} - -{% endif %} -{### Alter column statistics value ###} -{% if c.attstattarget is defined and c.attstattarget is not none and c.attstattarget > -1 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STATISTICS {{c.attstattarget}}; - -{% endif %} -{### Alter column storage value ###} -{% if c.attstorage is defined and c.attstorage != c.defaultstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STORAGE {%if c.attstorage == 'p' %} -PLAIN{% elif c.attstorage == 'm'%}MAIN{% elif c.attstorage == 'e'%} -EXTERNAL{% elif c.attstorage == 'x'%}EXTENDED{% endif %}; - -{% endif %} -{### ACL ###} -{% if c.attacl and c.attacl|length > 0 %} - -{% for priv in c.attacl %} -{{ COLUMN_PRIVILEGE.APPLY(conn, data.schema, data.name, c.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if c.seclabels and c.seclabels|length > 0 %} - -{% for r in c.seclabels %} -{{ COLUMN_SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.name, c.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% endfor %} -{% endif %} -{#===========================================#} -{# COLUMN SPECIFIC TEMPLATES ENDS HERE #} -{#===========================================#} -{#======================================#} -{# CONSTRAINTS SPECIFIC TEMPLATES #} -{#======================================#} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.primary_key)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.unique_constraint)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.foreign_key)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.check_constraint)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.exclude_constraint)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql deleted file mode 100644 index 1e65fbec48b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_tables_for_constraints.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT cl.oid as value, pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(relname) AS label -FROM pg_catalog.pg_namespace nsp, pg_catalog.pg_class cl -WHERE relnamespace=nsp.oid AND relkind in ('r', 'p') - AND nsp.nspname NOT LIKE E'pg\_temp\_%' - {% if not show_sysobj %} - AND (nsp.nspname NOT LIKE 'pg\_%' AND nsp.nspname NOT in ('information_schema')) - {% endif %} -ORDER BY nspname, relname diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql deleted file mode 100644 index 99a4b51b539..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/properties.sql +++ /dev/null @@ -1,77 +0,0 @@ -SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END) as spcname, - (CASE rel.relreplident - WHEN 'd' THEN 'default' - WHEN 'n' THEN 'nothing' - WHEN 'f' THEN 'full' - WHEN 'i' THEN 'index' - END) as replica_identity, - (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as schema, - pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relkind, - (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, - rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, - EXISTS(select 1 FROM pg_catalog.pg_trigger - JOIN pg_catalog.pg_proc pt ON pt.oid=tgfoid AND pt.proname='logtrigger' - JOIN pg_catalog.pg_proc pc ON pc.pronamespace=pt.pronamespace AND pc.proname='slonyversion' - WHERE tgrelid=rel.oid) AS isrepl, - (SELECT count(*) FROM pg_catalog.pg_trigger WHERE tgrelid=rel.oid AND tgisinternal = FALSE) AS triggercount, - (SELECT ARRAY(SELECT CASE WHEN (nspname NOT LIKE 'pg\_%') THEN - pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(c.relname) - ELSE pg_catalog.quote_ident(c.relname) END AS inherited_tables - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid ORDER BY inhseqno)) AS coll_inherits, - (SELECT count(*) - FROM pg_catalog.pg_inherits i - JOIN pg_catalog.pg_class c ON c.oid = i.inhparent - JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace - WHERE i.inhrelid = rel.oid) AS inherited_tables_cnt, - (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'parallel_workers=([0-9]*)') AS parallel_workers, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'toast_tuple_target=([0-9]*)') AS toast_tuple_target, - (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, am.amname, - CASE WHEN typ.typname IS NOT NULL THEN (select pg_catalog.quote_ident(nspname) FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid )||'.'||pg_catalog.quote_ident(typ.typname) ELSE typ.typname END AS typname, - typ.typrelid AS typoid, rel.relrowsecurity as rlspolicy, rel.relforcerowsecurity as forcerlspolicy, - (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=rel.oid AND sl1.objsubid=0) AS seclabels, - (CASE WHEN rel.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_table - -- Added for partition table - {% if tid %}, (CASE WHEN rel.relkind = 'p' THEN pg_catalog.pg_get_partkeydef({{ tid }}::oid) ELSE '' END) AS partition_scheme {% endif %} -FROM pg_catalog.pg_class rel - LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=rel.reltablespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) - LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' - LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid - LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid - LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam -WHERE rel.relkind IN ('r','s','t','p') AND rel.relnamespace = {{ scid }}::oid -AND NOT rel.relispartition -{% if tid %} AND rel.oid = {{ tid }}::oid {% endif %} -ORDER BY rel.relname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/update.sql deleted file mode 100644 index e720c171efa..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/update.sql +++ /dev/null @@ -1,292 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{#####################################################} -{## Rename table ##} -{#####################################################} -{% if data.name and data.name != o_data.name %} -ALTER TABLE IF EXISTS {{conn|qtIdent(o_data.schema, o_data.name)}} - RENAME TO {{conn|qtIdent(data.name)}}; - -{% endif %} -{#####################################################} -{## Change table schema ##} -{#####################################################} -{% if data.schema and data.schema != o_data.schema %} -ALTER TABLE IF EXISTS {{conn|qtIdent(o_data.schema, data.name)}} - SET SCHEMA {{conn|qtIdent(data.schema)}}; - -{% endif %} -{#####################################################} -{## Change table owner ##} -{#####################################################} -{% if data.relowner and data.relowner != o_data.relowner %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER TO {{conn|qtIdent(data.relowner)}}; - -{% endif %} -{#####################################################} -{## Update Inherits table definition ##} -{#####################################################} -{% if data.coll_inherits_added|length > 0 %} -{% for val in data.coll_inherits_added %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - INHERIT {{val}}; - -{% endfor %} -{% endif %} -{% if data.coll_inherits_removed|length > 0 %} -{% for val in data.coll_inherits_removed %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - NO INHERIT {{val}}; - -{% endfor %} -{% endif %} -{#####################################################} -{## Change table persistence (UNLOGGED / LOGGED) ##} -{#####################################################} -{% if data.relpersistence is defined and data.relpersistence != o_data.relpersistence %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET {% if data.relpersistence %}UNLOGGED{% else %}LOGGED{% endif %}; - -{% endif %} -{#####################################################} -{## Change tablespace ##} -{#####################################################} -{% if data.spcname and data.spcname != o_data.spcname %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET TABLESPACE {{conn|qtIdent(data.spcname)}}; - -{% endif %} - - -{#####################################################} -{## Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.rlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ENABLE ROW LEVEL SECURITY; -{% elif data.rlspolicy is defined and data.rlspolicy != o_data.rlspolicy%} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - DISABLE ROW LEVEL SECURITY; - -{% endif %} - -{#####################################################} -{## Force Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.forcerlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - FORCE ROW LEVEL SECURITY; -{% elif data.forcerlspolicy is defined and data.forcerlspolicy != o_data.forcerlspolicy%} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - NO FORCE ROW LEVEL SECURITY; -{% endif %} - -{#####################################################} -{## change fillfactor settings ##} -{#####################################################} -{% if data.fillfactor and data.fillfactor != o_data.fillfactor %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (FILLFACTOR={{data.fillfactor}}); -{% elif (data.fillfactor == '' or data.fillfactor == None) and data.fillfactor != o_data.fillfactor %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (FILLFACTOR); - -{% endif %} - -{## change parallel_workers settings ##} -{#####################################################} -{% if (data.parallel_workers == '' or data.parallel_workers == None) and data.parallel_workers != o_data.parallel_workers %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (parallel_workers); -{% elif data.parallel_workers is defined and data.parallel_workers != o_data.parallel_workers %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (parallel_workers={{data.parallel_workers}}); - -{% endif %} - -{## change toast_tuple_target settings ##} -{#####################################################} -{% if (data.toast_tuple_target == '' or data.toast_tuple_target == None) and data.toast_tuple_target != o_data.toast_tuple_target %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - RESET (toast_tuple_target); -{% elif data.toast_tuple_target is defined and data.toast_tuple_target != o_data.toast_tuple_target %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET (toast_tuple_target={{data.toast_tuple_target}}); - -{% endif %} - -{###############################} -{## Table AutoVacuum settings ##} -{###############################} -{% if data.vacuum_table is defined and data.vacuum_table.set_values|length > 0 %} -{% set has_vacuum_set = true %} -{% endif %} -{% if data.vacuum_table is defined and data.vacuum_table.reset_values|length > 0 %} -{% set has_vacuum_reset = true %} -{% endif %} -{% if o_data.autovacuum_custom and data.autovacuum_custom == false %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( - autovacuum_enabled, - autovacuum_analyze_scale_factor, - autovacuum_analyze_threshold, - autovacuum_freeze_max_age, - autovacuum_vacuum_cost_delay, - autovacuum_vacuum_cost_limit, - autovacuum_vacuum_scale_factor, - autovacuum_vacuum_threshold, - autovacuum_freeze_min_age, - autovacuum_freeze_table_age -); -{% else %} -{% if (data.autovacuum_enabled in ('t', 'f') and data.autovacuum_enabled != o_data.autovacuum_enabled) or has_vacuum_set %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} SET ( -{% if data.autovacuum_enabled in ('t', 'f') and data.autovacuum_enabled != o_data.autovacuum_enabled %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if has_vacuum_set %}, -{% endif %} -{% endif %} -{% if has_vacuum_set %} -{% for opt in data.vacuum_table.set_values %}{% if opt.name and opt.value is defined %} - {{opt.name}} = {{opt.value}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% if (data.autovacuum_enabled == 'x' and data.autovacuum_enabled != o_data.autovacuum_enabled) or has_vacuum_reset %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( -{% if data.autovacuum_enabled =='x' and data.autovacuum_enabled != o_data.autovacuum_enabled %} - autovacuum_enabled{% if has_vacuum_reset %}, -{% endif %} -{% endif %} -{% if has_vacuum_reset %} -{% for opt in data.vacuum_table.reset_values %}{% if opt.name %} - {{opt.name}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% endif %} -{#####################################} -{## Toast table AutoVacuum settings ##} -{#####################################} -{% if data.vacuum_toast is defined and data.vacuum_toast.set_values|length > 0 %} -{% set has_vacuum_toast_set = true %} -{% endif %} -{% if data.vacuum_toast is defined and data.vacuum_toast.reset_values|length > 0 %} -{% set has_vacuum_toast_reset = true %} -{% endif %} -{% if o_data.toast_autovacuum and data.toast_autovacuum == false %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( - toast.autovacuum_enabled, - toast.autovacuum_freeze_max_age, - toast.autovacuum_vacuum_cost_delay, - toast.autovacuum_vacuum_cost_limit, - toast.autovacuum_vacuum_scale_factor, - toast.autovacuum_vacuum_threshold, - toast.autovacuum_freeze_min_age, - toast.autovacuum_freeze_table_age, - toast.autovacuum_analyze_threshold, - toast.autovacuum_analyze_scale_factor -); -{% else %} -{% if (data.toast_autovacuum_enabled in ('t', 'f') and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled) or has_vacuum_toast_set %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} SET ( -{% if data.toast_autovacuum_enabled in ('t', 'f') and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if has_vacuum_toast_set %}, -{% endif %} -{% endif %} -{% if has_vacuum_toast_set %} -{% for opt in data.vacuum_toast.set_values %}{% if opt.name and opt.value is defined %} - toast.{{opt.name}} = {{opt.value}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% if (data.toast_autovacuum_enabled == 'x' and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled) or has_vacuum_toast_reset %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( -{% if data.toast_autovacuum_enabled == 'x' and data.toast_autovacuum_enabled != o_data.toast_autovacuum_enabled %} - toast.autovacuum_enabled{% if has_vacuum_toast_reset %}, -{% endif %} -{% endif %} -{% if has_vacuum_toast_reset %} -{% for opt in data.vacuum_toast.reset_values %}{% if opt.name %} - toast.{{opt.name}}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} - -); -{% endif %} -{% endif %} -{#####################################################} -{## Change table comments ##} -{#####################################################} -{% if data.description is defined and data.description != o_data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; - -{% endif %} -{#####################################################} -{## Update table Privileges ##} -{#####################################################} -{% if data.relacl %} -{% if 'deleted' in data.relacl %} -{% for priv in data.relacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.relacl %} -{% for priv in data.relacl.changed %} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.old_grantee, data.name, data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in data.relacl %} -{% for priv in data.relacl.added %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{#####################################################} -{## Update table SecurityLabel ##} -{#####################################################} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'TABLE', data.name, r.provider, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} - -{% endif %} -{#####################################################} -{## Change replica identity ##} -{#####################################################} -{% if data.replica_identity and data.replica_identity != o_data.replica_identity %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} REPLICA IDENTITY {{data.replica_identity }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql deleted file mode 100644 index f3a20de3ea4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/14_plus/create.sql +++ /dev/null @@ -1,247 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'macros/variable.macros' as VARIABLE %} -{% 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 ======#} -{#===========================================#} -{# - If user has not provided any details but only name then - add empty bracket with table name -#} -{% set empty_bracket = ""%} -{% if data.coll_inherits|length == 0 and data.columns|length == 0 and not data.typname and not data.like_relation and data.primary_key|length == 0 and data.unique_constraint|length == 0 and data.foreign_key|length == 0 and data.check_constraint|length == 0 and data.exclude_constraint|length == 0 %} -{% set empty_bracket = "\n(\n)"%} -{% endif %} -{% set with_clause = false%} -{% if data.fillfactor or data.parallel_workers or data.toast_tuple_target or (data.autovacuum_custom and data.add_vacuum_settings_in_sql) or data.autovacuum_enabled in ('t', 'f') or (data.toast_autovacuum and data.add_vacuum_settings_in_sql) or data.toast_autovacuum_enabled in ('t', 'f') %} -{% set with_clause = true%} -{% endif %} -CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{conn|qtIdent(data.schema, data.name)}}{{empty_bracket}} -{% if data.typname %} - OF {{ data.typname }} -{% endif %} -{% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} -( -{% endif %} -{% if data.like_relation %} - LIKE {{ data.like_relation }}{% if data.like_default_value %} - - INCLUDING DEFAULTS{% endif %}{% if data.like_constraints %} - - INCLUDING CONSTRAINTS{% endif %}{% if data.like_indexes %} - - INCLUDING INDEXES{% endif %}{% if data.like_storage %} - - INCLUDING STORAGE{% endif %}{% if data.like_comments %} - - INCLUDING COMMENTS{% endif %}{% if data.like_compression %} - - INCLUDING COMPRESSION{% endif %}{% if data.like_generated %} - - INCLUDING GENERATED{% endif %}{% if data.like_identity %} - - INCLUDING IDENTITY{% endif %}{% if data.like_statistics %} - - INCLUDING STATISTICS{% endif %}{% if data.columns|length > 0 %}, -{% endif %} - -{% endif %} -{### Add columns ###} -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} -{% if c.name and c.cltype %} - {% if c.inheritedfromtype and c.has_with_options %}{# Use WITH OPTIONS syntax for modified OF TYPE columns #}{{conn|qtIdent(c.name)}} WITH OPTIONS{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% elif c.inheritedfromtable %}{# Inherited from parent table - keep as comment #}-- Inherited from table {{c.inheritedfromtable}}: {{conn|qtIdent(c.name)}}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% else %}{# Regular column or inherited without modifications #}{% if c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.geometry and not is_sql %}({{c.geometry}}{% if c.srid %},{{c.srid}}{% endif %}){% endif %}{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% endif %} -{% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} -{% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} -{% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} -{% if c.seqcycle is defined and c.seqcycle %} -CYCLE {% endif %}{% if c.seqincrement is defined and c.seqincrement|int(-1) > -1 %} -INCREMENT {{c.seqincrement|int}} {% endif %}{% if c.seqstart is defined and c.seqstart|int(-1) > -1%} -START {{c.seqstart|int}} {% endif %}{% if c.seqmin is defined and c.seqmin|int(-1) > -1%} -MINVALUE {{c.seqmin|int}} {% endif %}{% if c.seqmax is defined and c.seqmax|int(-1) > -1%} -MAXVALUE {{c.seqmax|int}} {% endif %}{% if c.seqcache is defined and c.seqcache|int(-1) > -1%} -CACHE {{c.seqcache|int}} {% endif %} -{% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %}){% endif %} -{% endif %} -{% if c.colconstype == 'g' and c.genexpr and c.genexpr != '' %} GENERATED ALWAYS AS ({{c.genexpr}}) STORED{% endif %} -{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} -{% endif %} -{# Macro to render for constraints #} -{% if data.primary_key|length > 0 %}{% if data.columns|length > 0 %},{% endif %} -{{CONSTRAINTS.PRIMARY_KEY(conn, data.primary_key[0])}}{% endif %}{% if data.unique_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 %},{% endif %} -{{CONSTRAINTS.UNIQUE(conn, data.unique_constraint)}}{% endif %}{% if data.foreign_key|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.FOREIGN_KEY(conn, data.foreign_key)}}{% endif %}{% if data.check_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 %},{% endif %} -{{CONSTRAINTS.CHECK(conn, data.check_constraint)}}{% endif %}{% if data.exclude_constraint|length > 0 %}{% if data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 %},{% endif %} -{{CONSTRAINTS.EXCLUDE(conn, data.exclude_constraint)}}{% endif %} -{% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} - -){% endif %}{% if data.relkind is defined and data.relkind == 'p' %} PARTITION BY {{ data.partition_scheme }}{% endif %} -{% if not data.coll_inherits and not data.spcname and not with_clause and not data.amname %};{% endif %} - -{### If we are inheriting it from another table(s) ###} -{% if data.coll_inherits %} - INHERITS ({% for val in data.coll_inherits %}{% if loop.index != 1 %}, {% endif %}{{val}}{% endfor %}){% if not data.spcname and not with_clause and not data.amname %};{% endif %} -{% endif %} - -{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} -USING {{data.amname}} -{% elif data.amname and not data.default_amname %} -USING {{data.amname}}{% if not data.spcname and not with_clause %};{% endif %} -{% endif %} - -{% if with_clause %} -{% set ns = namespace(add_comma=false) %} -WITH ( -{% if data.fillfactor %}{% set ns.add_comma = true%} - FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.parallel_workers %} -{% if ns.add_comma %}, -{% endif %} - parallel_workers = {{ data.parallel_workers }}{% set ns.add_comma = true%}{% endif %}{% if data.toast_tuple_target %} -{% if ns.add_comma %}, -{% endif %} - toast_tuple_target = {{ data.toast_tuple_target }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_custom %} -{% for opt in data.vacuum_table %}{% if opt.name and opt.value is defined %} -{% if ns.add_comma %}, -{% endif %} - {{opt.name}} = {{opt.value}}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %}{% if data.toast_autovacuum %} -{% for opt in data.vacuum_toast %}{% if opt.name and opt.value is defined %} -{% if ns.add_comma %}, -{% endif %} - toast.{{opt.name}} = {{opt.value}}{% set ns.add_comma = true%}{% endif %} -{% endfor %}{% endif %} - -{% if data.spcname %}){% else %});{% endif %} - -{% endif %} -{### SQL for Tablespace ###} -{% if data.spcname %} -TABLESPACE {{ conn|qtIdent(data.spcname) }}; -{% endif %} -{### Alter SQL for Owner ###} -{% if data.relowner %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - OWNER to {{conn|qtIdent(data.relowner)}}; -{% endif %} - -{#####################################################} -{## Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.rlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ENABLE ROW LEVEL SECURITY; -{% endif %} - -{#####################################################} -{## Force Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.forcerlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - FORCE ROW LEVEL SECURITY; -{% endif %} - -{### Security Labels on Table ###} -{% if data.seclabels and data.seclabels|length > 0 %} - -{% for r in data.seclabels %} -{{ SECLABEL.SET(conn, 'TABLE', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{### ACL on Table ###} -{% if data.revoke_all %} -{% for priv in data.revoke_all %} -{{ PRIVILEGE.UNSETALL(conn, "TABLE", priv, data.name, data.schema)}} -{% endfor %} -{% endif %} -{% if data.relacl %} - -{% for priv in data.relacl %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{### SQL for COMMENT ###} -{% if data.description %} -COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{#===========================================#} -{#====== MAIN TABLE TEMPLATE ENDS HERE ======#} -{#===========================================#} -{#===========================================#} -{# COLUMN SPECIFIC TEMPLATES STARTS HERE #} -{#===========================================#} -{% if data.columns and data.columns|length > 0 %} -{% for c in data.columns %} -{### Set default value for inherited columns ###} -{% if c.inheritedfromtable and c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET DEFAULT {{c.defval}}; - -{% endif %} -{% if c.description %} - -COMMENT ON COLUMN {{conn|qtIdent(data.schema, data.name, c.name)}} - IS {{c.description|qtLiteral(conn)}}; -{% endif %} -{### Add variables to column ###} -{% if c.attoptions and c.attoptions|length > 0 %} - -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - {{ VARIABLE.SET(conn, 'COLUMN', c.name, c.attoptions) }} - -{% endif %} -{### Alter column statistics value ###} -{% if c.attstattarget is defined and c.attstattarget is not none and c.attstattarget > -1 %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STATISTICS {{c.attstattarget}}; - -{% endif %} -{### Alter column storage value ###} -{% if c.attstorage is defined and c.attstorage != c.defaultstorage %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET STORAGE {%if c.attstorage == 'p' %} -PLAIN{% elif c.attstorage == 'm'%}MAIN{% elif c.attstorage == 'e'%} -EXTERNAL{% elif c.attstorage == 'x'%}EXTENDED{% endif %}; - -{% endif %} -{### ACL ###} -{% if c.attacl and c.attacl|length > 0 %} - -{% for priv in c.attacl %} -{{ COLUMN_PRIVILEGE.APPLY(conn, data.schema, data.name, c.name, priv.grantee, priv.without_grant, priv.with_grant) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if c.seclabels and c.seclabels|length > 0 %} - -{% for r in c.seclabels %} -{{ COLUMN_SECLABEL.APPLY(conn, 'COLUMN',data.schema, data.name, c.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% endfor %} -{% endif %} -{#===========================================#} -{# COLUMN SPECIFIC TEMPLATES ENDS HERE #} -{#===========================================#} -{#======================================#} -{# CONSTRAINTS SPECIFIC TEMPLATES #} -{#======================================#} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.primary_key)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.unique_constraint)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.foreign_key)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.check_constraint)}} -{{CONSTRAINTS.CONSTRAINT_COMMENTS(conn, data.schema, data.name, data.exclude_constraint)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql index cf755f65f0a..f3a20de3ea4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql @@ -16,6 +16,10 @@ {% if data.coll_inherits|length == 0 and data.columns|length == 0 and not data.typname and not data.like_relation and data.primary_key|length == 0 and data.unique_constraint|length == 0 and data.foreign_key|length == 0 and data.check_constraint|length == 0 and data.exclude_constraint|length == 0 %} {% set empty_bracket = "\n(\n)"%} {% endif %} +{% set with_clause = false%} +{% if data.fillfactor or data.parallel_workers or data.toast_tuple_target or (data.autovacuum_custom and data.add_vacuum_settings_in_sql) or data.autovacuum_enabled in ('t', 'f') or (data.toast_autovacuum and data.add_vacuum_settings_in_sql) or data.toast_autovacuum_enabled in ('t', 'f') %} +{% set with_clause = true%} +{% endif %} CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{conn|qtIdent(data.schema, data.name)}}{{empty_bracket}} {% if data.typname %} OF {{ data.typname }} @@ -34,7 +38,11 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists INCLUDING STORAGE{% endif %}{% if data.like_comments %} - INCLUDING COMMENTS{% endif %}{% if data.like_identity %} + INCLUDING COMMENTS{% endif %}{% if data.like_compression %} + + INCLUDING COMPRESSION{% endif %}{% if data.like_generated %} + + INCLUDING GENERATED{% endif %}{% if data.like_identity %} INCLUDING IDENTITY{% endif %}{% if data.like_statistics %} @@ -46,7 +54,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE{% if add_not_exists {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {% if c.name and c.cltype %} - {% if c.inheritedfromtype and c.has_with_options %}{# Use WITH OPTIONS syntax for modified OF TYPE columns #}{{conn|qtIdent(c.name)}} WITH OPTIONS{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %}{% elif c.inheritedfromtable %}{# Inherited from parent table - keep as comment #}-- Inherited from table {{c.inheritedfromtable}}: {{conn|qtIdent(c.name)}}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %}{% else %}{# Regular column or inherited without modifications #}{% if c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if c.displaytypname %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.geometry and not is_sql %}({{c.geometry}}{% if c.srid %},{{c.srid}}{% endif %}){% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' %} DEFAULT {{c.defval}}{% endif %}{% endif %} + {% if c.inheritedfromtype and c.has_with_options %}{# Use WITH OPTIONS syntax for modified OF TYPE columns #}{{conn|qtIdent(c.name)}} WITH OPTIONS{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% elif c.inheritedfromtable %}{# Inherited from parent table - keep as comment #}-- Inherited from table {{c.inheritedfromtable}}: {{conn|qtIdent(c.name)}}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% else %}{# Regular column or inherited without modifications #}{% if c.inheritedfromtype %}-- Inherited from type {{c.inheritedfromtype}}: {% endif %}{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.geometry and not is_sql %}({{c.geometry}}{% if c.srid %},{{c.srid}}{% endif %}){% endif %}{% if c.attcompression is defined and c.attcompression is not none and c.attcompression != '' %} COMPRESSION {{c.attcompression}}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} DEFAULT {{c.defval}}{% endif %}{% endif %} {% if c.colconstype == 'i' and c.attidentity and c.attidentity != '' %} {% if c.attidentity == 'a' %} GENERATED ALWAYS AS IDENTITY{% elif c.attidentity == 'd' %} GENERATED BY DEFAULT AS IDENTITY{% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %} ( {% endif %} @@ -59,6 +67,7 @@ MAXVALUE {{c.seqmax|int}} {% endif %}{% if c.seqcache is defined and c.seqcache| CACHE {{c.seqcache|int}} {% endif %} {% if c.seqincrement or c.seqcycle or c.seqincrement or c.seqstart or c.seqmin or c.seqmax or c.seqcache %}){% endif %} {% endif %} +{% if c.colconstype == 'g' and c.genexpr and c.genexpr != '' %} GENERATED ALWAYS AS ({{c.genexpr}}) STORED{% endif %} {% if not loop.last %}, {% endif %} {% endif %} @@ -74,33 +83,53 @@ CACHE {{c.seqcache|int}} {% endif %} {% if data.like_relation or data.coll_inherits or data.columns|length > 0 or data.primary_key|length > 0 or data.unique_constraint|length > 0 or data.foreign_key|length > 0 or data.check_constraint|length > 0 or data.exclude_constraint|length > 0 %} ){% endif %}{% if data.relkind is defined and data.relkind == 'p' %} PARTITION BY {{ data.partition_scheme }}{% endif %} +{% if not data.coll_inherits and not data.spcname and not with_clause and not data.amname %};{% endif %} {### If we are inheriting it from another table(s) ###} {% if data.coll_inherits %} - INHERITS ({% for val in data.coll_inherits %}{% if loop.index != 1 %}, {% endif %}{{val}}{% endfor %}) + INHERITS ({% for val in data.coll_inherits %}{% if loop.index != 1 %}, {% endif %}{{val}}{% endfor %}){% if not data.spcname and not with_clause and not data.amname %};{% endif %} {% endif %} + +{% if data.default_amname and data.default_amname != data.amname and data.amname is not none %} +USING {{data.amname}} +{% elif data.amname and not data.default_amname %} +USING {{data.amname}}{% if not data.spcname and not with_clause %};{% endif %} +{% endif %} + +{% if with_clause %} +{% set ns = namespace(add_comma=false) %} WITH ( - OIDS = {% if data.relhasoids %}TRUE{% else %}FALSE{% endif %}{% if data.fillfactor %}, - FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.parallel_workers is defined and data.parallel_workers != '' and data.parallel_workers != None %}, - parallel_workers = {{ data.parallel_workers }}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %}, - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %}, - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %} -{% endif %}{% if data.autovacuum_custom and data.vacuum_table|length > 0 %} +{% if data.fillfactor %}{% set ns.add_comma = true%} + FILLFACTOR = {{ data.fillfactor }}{% endif %}{% if data.parallel_workers %} +{% if ns.add_comma %}, +{% endif %} + parallel_workers = {{ data.parallel_workers }}{% set ns.add_comma = true%}{% endif %}{% if data.toast_tuple_target %} +{% if ns.add_comma %}, +{% endif %} + toast_tuple_target = {{ data.toast_tuple_target }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} +{% if ns.add_comma %}, +{% endif %} + autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} +{% if ns.add_comma %}, +{% endif %} + toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_custom %} {% for opt in data.vacuum_table %}{% if opt.name and opt.value is defined %} -, - {{opt.name}} = {{opt.value}}{% endif %} -{% endfor %}{% endif %}{% if data.toast_autovacuum and data.vacuum_toast|length > 0 %} +{% if ns.add_comma %}, +{% endif %} + {{opt.name}} = {{opt.value}}{% set ns.add_comma = true%}{% endif %} +{% endfor %}{% endif %}{% if data.toast_autovacuum %} {% for opt in data.vacuum_toast %}{% if opt.name and opt.value is defined %} -, - toast.{{opt.name}} = {{opt.value}}{% endif %} +{% if ns.add_comma %}, +{% endif %} + toast.{{opt.name}} = {{opt.value}}{% set ns.add_comma = true%}{% endif %} {% endfor %}{% endif %} +{% if data.spcname %}){% else %});{% endif %} + +{% endif %} {### SQL for Tablespace ###} {% if data.spcname %} -) TABLESPACE {{ conn|qtIdent(data.spcname) }}; -{% else %} -); {% endif %} {### Alter SQL for Owner ###} {% if data.relowner %} @@ -158,7 +187,7 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {% if data.columns and data.columns|length > 0 %} {% for c in data.columns %} {### Set default value for inherited columns ###} -{% if c.inheritedfromtable and c.defval is defined and c.defval is not none and c.defval != '' %} +{% if c.inheritedfromtable and c.defval is defined and c.defval is not none and c.defval != '' and c.colconstype != 'g' %} ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} ALTER COLUMN {{conn|qtTypeIdent(c.name)}} SET DEFAULT {{c.defval}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_access_methods.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_access_methods.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/12_plus/get_access_methods.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_access_methods.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_collation.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/11_plus/get_collation.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_collation.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/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 index b0dd3d33293..1e65fbec48b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/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 @@ -1,6 +1,6 @@ SELECT cl.oid as value, pg_catalog.quote_ident(nspname)||'.'||pg_catalog.quote_ident(relname) AS label FROM pg_catalog.pg_namespace nsp, pg_catalog.pg_class cl -WHERE relnamespace=nsp.oid AND relkind='r' +WHERE relnamespace=nsp.oid AND relkind in ('r', 'p') AND nsp.nspname NOT LIKE E'pg\_temp\_%' {% if not show_sysobj %} AND (nsp.nspname NOT LIKE 'pg\_%' AND nsp.nspname NOT in ('information_schema')) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/properties.sql index 47e9a75dc85..99a4b51b539 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/properties.sql @@ -1,5 +1,5 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS relacl_str, - (CASE WHEN length(spc.spcname::text) > 0 THEN spc.spcname ELSE + (CASE WHEN length(spc.spcname::text) > 0 OR rel.relkind = 'p' THEN spc.spcname ELSE (SELECT sp.spcname FROM pg_catalog.pg_database dtb JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid WHERE dtb.oid = {{ did }}::oid) @@ -11,7 +11,7 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r WHEN 'i' THEN 'index' END) as replica_identity, (select nspname FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid ) as schema, - pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relhasoids, rel.relkind, + pg_catalog.pg_get_userbyid(rel.relowner) AS relowner, rel.relkind, (CASE WHEN rel.relkind = 'p' THEN true ELSE false END) AS is_partitioned, rel.relhassubclass, rel.reltuples::bigint, des.description, con.conname, con.conkey, EXISTS(select 1 FROM pg_catalog.pg_trigger @@ -32,8 +32,10 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace WHERE i.inhrelid = rel.oid) AS inherited_tables_cnt, (CASE WHEN rel.relpersistence = 'u' THEN true ELSE false END) AS relpersistence, + (SELECT st.setting from pg_catalog.pg_show_all_settings() st WHERE st.name = 'default_table_access_method') as default_amname, substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'fillfactor=([0-9]*)') AS fillfactor, substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'parallel_workers=([0-9]*)') AS parallel_workers, + substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'toast_tuple_target=([0-9]*)') AS toast_tuple_target, (substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, substring(pg_catalog.array_to_string(rel.reloptions, ',') FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, @@ -54,7 +56,7 @@ SELECT rel.oid, rel.relname AS name, rel.reltablespace AS spcoid,rel.relacl AS r substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, + rel.reloptions AS reloptions, tst.reloptions AS toast_reloptions, rel.reloftype, am.amname, CASE WHEN typ.typname IS NOT NULL THEN (select pg_catalog.quote_ident(nspname) FROM pg_catalog.pg_namespace WHERE oid = {{scid}}::oid )||'.'||pg_catalog.quote_ident(typ.typname) ELSE typ.typname END AS typname, typ.typrelid AS typoid, rel.relrowsecurity as rlspolicy, rel.relforcerowsecurity as forcerlspolicy, (CASE WHEN rel.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable, @@ -68,6 +70,7 @@ FROM pg_catalog.pg_class rel LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid + LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = rel.relam WHERE rel.relkind IN ('r','s','t','p') AND rel.relnamespace = {{ scid }}::oid AND NOT rel.relispartition {% if tid %} AND rel.oid = {{ tid }}::oid {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/update.sql index 61eda61e140..e720c171efa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/update.sql @@ -41,14 +41,6 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} NO INHERIT {{val}}; {% endfor %} -{% endif %} -{#####################################################} -{## Change hasOID attribute of table ##} -{#####################################################} -{% if data.relhasoids is defined and data.relhasoids != o_data.relhasoids %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - SET {% if data.relhasoids %}WITH{% else %}WITHOUT{% endif %} OIDS; - {% endif %} {#####################################################} {## Change table persistence (UNLOGGED / LOGGED) ##} @@ -66,6 +58,31 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} SET TABLESPACE {{conn|qtIdent(data.spcname)}}; {% endif %} + + +{#####################################################} +{## Enable Row Level Security Policy on table ##} +{#####################################################} +{% if data.rlspolicy %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + ENABLE ROW LEVEL SECURITY; +{% elif data.rlspolicy is defined and data.rlspolicy != o_data.rlspolicy%} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + DISABLE ROW LEVEL SECURITY; + +{% endif %} + +{#####################################################} +{## Force Enable Row Level Security Policy on table ##} +{#####################################################} +{% if data.forcerlspolicy %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + FORCE ROW LEVEL SECURITY; +{% elif data.forcerlspolicy is defined and data.forcerlspolicy != o_data.forcerlspolicy%} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + NO FORCE ROW LEVEL SECURITY; +{% endif %} + {#####################################################} {## change fillfactor settings ##} {#####################################################} @@ -77,6 +94,29 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET (FILLFACTOR); {% endif %} + +{## change parallel_workers settings ##} +{#####################################################} +{% if (data.parallel_workers == '' or data.parallel_workers == None) and data.parallel_workers != o_data.parallel_workers %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + RESET (parallel_workers); +{% elif data.parallel_workers is defined and data.parallel_workers != o_data.parallel_workers %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + SET (parallel_workers={{data.parallel_workers}}); + +{% endif %} + +{## change toast_tuple_target settings ##} +{#####################################################} +{% if (data.toast_tuple_target == '' or data.toast_tuple_target == None) and data.toast_tuple_target != o_data.toast_tuple_target %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + RESET (toast_tuple_target); +{% elif data.toast_tuple_target is defined and data.toast_tuple_target != o_data.toast_tuple_target %} +ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} + SET (toast_tuple_target={{data.toast_tuple_target}}); + +{% endif %} + {###############################} {## Table AutoVacuum settings ##} {###############################} @@ -133,30 +173,6 @@ ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} RESET ( ); {% endif %} {% endif %} - -{#####################################################} -{## Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.rlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - ENABLE ROW LEVEL SECURITY; -{% elif data.rlspolicy is defined and data.rlspolicy != o_data.rlspolicy%} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - DISABLE ROW LEVEL SECURITY; - -{% endif %} - -{#####################################################} -{## Force Enable Row Level Security Policy on table ##} -{#####################################################} -{% if data.forcerlspolicy %} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - FORCE ROW LEVEL SECURITY; -{% elif data.forcerlspolicy is defined and data.forcerlspolicy != o_data.forcerlspolicy%} -ALTER TABLE IF EXISTS {{conn|qtIdent(data.schema, data.name)}} - NO FORCE ROW LEVEL SECURITY; -{% endif %} - {#####################################} {## Toast table AutoVacuum settings ##} {#####################################} @@ -268,7 +284,6 @@ COMMENT ON TABLE {{conn|qtIdent(data.schema, data.name)}} {% endif %} {% endif %} - {#####################################################} {## Change replica identity ##} {#####################################################} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/create.sql deleted file mode 100644 index f3d7c207095..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/create.sql +++ /dev/null @@ -1,37 +0,0 @@ -{### Set a flag which allows us to put OR between events ###} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {{data.fires}} {% if data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %} -{% if data.tgoldtable or data.tgnewtable %} - REFERENCING{% if data.tgnewtable %} NEW TABLE AS {{ conn|qtIdent(data.tgnewtable) }}{% endif %}{% if data.tgoldtable %} OLD TABLE AS {{ conn|qtIdent(data.tgoldtable) }}{% endif %} - -{% endif %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} -{% if data.whenclause %} - - WHEN {% if not data.oid %}({% endif %}{{ data.whenclause }}{% if not data.oid %}){% endif %}{% endif %} - - {% if data.prosrc is defined and - (data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL') %}{{ data.prosrc }}{% else %}EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}{% endif%}; - -{% if data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/update.sql deleted file mode 100644 index 37962f1067d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/11_plus/update.sql +++ /dev/null @@ -1,61 +0,0 @@ -{% if data.name and o_data.name != data.name %} -ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{% if ((data.tfunction is defined or data.is_row_trigger is defined or data.evnt_insert is defined or data.evnt_delete is defined or data.evnt_update is defined or data.fires is defined or data.is_constraint_trigger is defined or data.whenclause is defined) and (o_data.tfunction != data.tfunction or data.is_row_trigger != o_data.is_row_trigger or data.evnt_insert != o_data.evnt_insert or data.evnt_delete != o_data.evnt_delete or data.evnt_update != o_data.evnt_update or o_data.fires != data.fires or data.is_constraint_trigger != o_data.is_constraint_trigger or data.whenclause != o_data.whenclause)) %} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {% if data.fires is defined %}{{data.fires}} {% else %}{{o_data.fires}} {% endif %}{% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_truncate is not defined %}{% if o_data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %}{% else %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% elif o_data.tgdeferrable %} - DEFERRABLE{% if o_data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %}{% if data.is_row_trigger is not defined %} - FOR EACH{% if o_data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% else %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% endif %} - -{% if data.whenclause %} - WHEN {{ data.whenclause }} -{% elif o_data.whenclause %} - WHEN {{ o_data.whenclause }} -{% endif %} -{% if (data.tfunction is defined) %} - EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}; -{% else %} - EXECUTE FUNCTION {{ o_data.tfunction }}{% if o_data.tgargs %}({{ o_data.tgargs }}){% else %}(){% endif%}; -{% endif %} - -{% if data.description is not defined and o_data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{o_data.description|qtLiteral(conn)}}; -{% endif %} -{% endif %} -{% if data.description is defined and o_data.description != data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{% if data.is_enable_trigger is defined and o_data.is_enable_trigger != data.is_enable_trigger %} -{% set enable_map = {'R':'ENABLE REPLICA', 'A':'ENABLE ALWAYS', 'O':'ENABLE', 'D':'DISABLE'} %} -ALTER TABLE {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - {{ enable_map[data.is_enable_trigger] }} TRIGGER {{ conn|qtIdent(data.name) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/create.sql deleted file mode 100644 index fb799ca9ea6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/create.sql +++ /dev/null @@ -1,37 +0,0 @@ -{### Set a flag which allows us to put OR between events ###} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {{data.fires}} {% if data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %} -{% if data.tgoldtable or data.tgnewtable %} - REFERENCING{% if data.tgnewtable %} NEW TABLE AS {{ conn|qtIdent(data.tgnewtable) }}{% endif %}{% if data.tgoldtable %} OLD TABLE AS {{ conn|qtIdent(data.tgoldtable) }}{% endif %} - -{% endif %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} -{% if data.whenclause %} - - WHEN {% if not data.oid %}({% endif %}{{ data.whenclause }}{% if not data.oid %}){% endif %}{% endif %} - - {% if data.prosrc is defined and - (data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL') %}{{ data.prosrc }}{% else %}EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}{% endif%}; - -{% if data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/update.sql deleted file mode 100644 index a1d9cb05b89..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/14_plus/update.sql +++ /dev/null @@ -1,61 +0,0 @@ -{% if data.name and o_data.name != data.name %} -ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{% if ((data.tfunction is defined or data.is_row_trigger is defined or data.evnt_insert is defined or data.evnt_delete is defined or data.evnt_update is defined or data.fires is defined or data.is_constraint_trigger is defined or data.whenclause is defined) and (o_data.tfunction != data.tfunction or data.is_row_trigger != o_data.is_row_trigger or data.evnt_insert != o_data.evnt_insert or data.evnt_delete != o_data.evnt_delete or data.evnt_update != o_data.evnt_update or o_data.fires != data.fires or data.is_constraint_trigger != o_data.is_constraint_trigger or data.whenclause != o_data.whenclause)) %} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {% if data.fires is defined %}{{data.fires}} {% else %}{{o_data.fires}} {% endif %}{% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_truncate is not defined %}{% if o_data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %}{% else %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% elif o_data.tgdeferrable %} - DEFERRABLE{% if o_data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %}{% if data.is_row_trigger is not defined %} - FOR EACH{% if o_data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% else %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% endif %} - -{% if data.whenclause %} - WHEN {{ data.whenclause }} -{% elif o_data.whenclause %} - WHEN {{ o_data.whenclause }} -{% endif %} -{% if (data.tfunction is defined) %} - EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}; -{% else %} - EXECUTE FUNCTION {{ o_data.tfunction }}{% if o_data.tgargs %}({{ o_data.tgargs }}){% else %}(){% endif%}; -{% endif %} - -{% if data.description is not defined and o_data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{o_data.description|qtLiteral(conn)}}; -{% endif %} -{% endif %} -{% if data.description is defined and o_data.description != data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{% if data.is_enable_trigger is defined and o_data.is_enable_trigger != data.is_enable_trigger %} -{% set enable_map = {'R':'ENABLE REPLICA', 'A':'ENABLE ALWAYS', 'O':'ENABLE', 'D':'DISABLE'} %} -ALTER TABLE {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - {{ enable_map[data.is_enable_trigger] }} TRIGGER {{ conn|qtIdent(data.name) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/create.sql index f3d7c207095..fb799ca9ea6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/create.sql @@ -3,7 +3,7 @@ {% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} +CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} {% endif %} {{data.fires}} {% if data.evnt_insert %}INSERT{% set or_flag = True %} {% endif %}{% if data.evnt_delete %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/update.sql index 37962f1067d..a1d9cb05b89 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/pg/default/update.sql @@ -8,7 +8,7 @@ ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, {% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} +CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} {% endif %} {% if data.fires is defined %}{{data.fires}} {% else %}{{o_data.fires}} {% endif %}{% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %} {% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/create.sql deleted file mode 100644 index f3d7c207095..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/create.sql +++ /dev/null @@ -1,37 +0,0 @@ -{### Set a flag which allows us to put OR between events ###} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {{data.fires}} {% if data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %} -{% if data.tgoldtable or data.tgnewtable %} - REFERENCING{% if data.tgnewtable %} NEW TABLE AS {{ conn|qtIdent(data.tgnewtable) }}{% endif %}{% if data.tgoldtable %} OLD TABLE AS {{ conn|qtIdent(data.tgoldtable) }}{% endif %} - -{% endif %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} -{% if data.whenclause %} - - WHEN {% if not data.oid %}({% endif %}{{ data.whenclause }}{% if not data.oid %}){% endif %}{% endif %} - - {% if data.prosrc is defined and - (data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL') %}{{ data.prosrc }}{% else %}EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}{% endif%}; - -{% if data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/update.sql deleted file mode 100644 index 8f99d632d8f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/11_plus/update.sql +++ /dev/null @@ -1,70 +0,0 @@ -{% if data.name and o_data.name != data.name %} -ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{% if ((data.tfunction is defined or data.is_row_trigger is defined or data.evnt_insert is defined or data.evnt_delete is defined or data.evnt_update is defined or data.fires is defined or data.is_constraint_trigger is defined or data.whenclause is defined) and (o_data.tfunction != data.tfunction or data.is_row_trigger != o_data.is_row_trigger or data.evnt_insert != o_data.evnt_insert or data.evnt_delete != o_data.evnt_delete or data.evnt_update != o_data.evnt_update or o_data.fires != data.fires or data.is_constraint_trigger != o_data.is_constraint_trigger or data.whenclause != o_data.whenclause)) %} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {% if data.fires is defined %}{{data.fires}} {% else %}{{o_data.fires}} {% endif %}{% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_truncate is not defined %}{% if o_data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %}{% else %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% elif o_data.tgdeferrable %} - DEFERRABLE{% if o_data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %}{% if data.is_row_trigger is not defined %} - FOR EACH{% if o_data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% else %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% endif %} - -{% if data.whenclause %} - WHEN {{ data.whenclause }} -{% elif o_data.whenclause %} - WHEN {{ o_data.whenclause }} -{% endif %} - -{%if data.tfunction == 'Inline EDB-SPL' %} -{% if (data.prosrc is not defined) %} -{{ o_data.prosrc }}; -{% else %} -{{ data.prosrc }}; -{% endif %} -{% else %} -{% if (data.tfunction is defined) %} - EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}; -{% else %} - EXECUTE FUNCTION {{ o_data.tfunction }}{% if o_data.tgargs %}({{ o_data.tgargs }}){% else %}(){% endif%}; -{% endif %} -{% endif %} - -{% if data.description is not defined and o_data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{o_data.description|qtLiteral(conn)}}; -{% endif %} -{% endif %} -{% if data.description is defined and o_data.description != data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{% if data.is_enable_trigger is defined and o_data.is_enable_trigger != data.is_enable_trigger %} -{% set enable_map = {'R':'ENABLE REPLICA', 'A':'ENABLE ALWAYS', 'O':'ENABLE', 'D':'DISABLE'} %} -ALTER TABLE {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - {{ enable_map[data.is_enable_trigger] }} TRIGGER {{ conn|qtIdent(data.name) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/count.sql deleted file mode 100644 index b17aaf7cb02..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/count.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT COUNT(*) -FROM pg_catalog.pg_trigger t - WHERE NOT tgisinternal - AND tgrelid = {{tid}}::OID - AND tgpackageoid = 0 diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/nodes.sql deleted file mode 100644 index 700da637f64..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/nodes.sql +++ /dev/null @@ -1,14 +0,0 @@ -SELECT t.oid, t.tgname as name, t.tgenabled AS is_enable_trigger, des.description -FROM pg_catalog.pg_trigger t - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_trigger'::regclass) - WHERE NOT tgisinternal - AND tgrelid = {{tid}}::OID - AND tgpackageoid = 0 -{% if trid %} - AND t.oid = {{trid}}::OID -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} - ORDER BY tgname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/properties.sql deleted file mode 100644 index a04ad8f8f0d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/12_plus/properties.sql +++ /dev/null @@ -1,25 +0,0 @@ -SELECT t.oid,t.tgname AS name, t.xmin, t.tgenabled AS is_enable_trigger, t.*, relname, CASE WHEN relkind = 'r' THEN TRUE ELSE FALSE END AS parentistable, - nspname, des.description, l.lanname, p.proname AS tfunction, - COALESCE(pg_catalog.substring(pg_catalog.pg_get_triggerdef(t.oid, true), 'WHEN (.*) EXECUTE (PROCEDURE|FUNCTION)'), - pg_catalog.substring(pg_catalog.pg_get_triggerdef(t.oid, true), 'WHEN (.*) \$trigger')) AS whenclause, - -- We need to convert tgargs column bytea datatype to array datatype - (pg_catalog.string_to_array(encode(tgargs, 'escape'), E'\\000')::text[])[1:tgnargs] AS custom_tgargs, -{% if datlastsysoid %} - (CASE WHEN t.oid <= {{ datlastsysoid}}::oid THEN true ElSE false END) AS is_sys_trigger, -{% endif %} - (CASE WHEN tgconstraint != 0::OID THEN true ElSE false END) AS is_constraint_trigger, - tgoldtable, - tgnewtable -FROM pg_catalog.pg_trigger t - JOIN pg_catalog.pg_class cl ON cl.oid=tgrelid - JOIN pg_catalog.pg_namespace na ON na.oid=relnamespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_trigger'::regclass) - LEFT OUTER JOIN pg_catalog.pg_proc p ON p.oid=t.tgfoid - LEFT OUTER JOIN pg_catalog.pg_language l ON l.oid=p.prolang -WHERE NOT tgisinternal - AND tgrelid = {{tid}}::OID - AND tgpackageoid = 0 -{% if trid %} - AND t.oid = {{trid}}::OID -{% endif %} -ORDER BY tgname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/create.sql deleted file mode 100644 index fb799ca9ea6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/create.sql +++ /dev/null @@ -1,37 +0,0 @@ -{### Set a flag which allows us to put OR between events ###} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {{data.fires}} {% if data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %} -{% if data.tgoldtable or data.tgnewtable %} - REFERENCING{% if data.tgnewtable %} NEW TABLE AS {{ conn|qtIdent(data.tgnewtable) }}{% endif %}{% if data.tgoldtable %} OLD TABLE AS {{ conn|qtIdent(data.tgoldtable) }}{% endif %} - -{% endif %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} -{% if data.whenclause %} - - WHEN {% if not data.oid %}({% endif %}{{ data.whenclause }}{% if not data.oid %}){% endif %}{% endif %} - - {% if data.prosrc is defined and - (data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL') %}{{ data.prosrc }}{% else %}EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}{% endif%}; - -{% if data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(data.schema, data.table) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/update.sql deleted file mode 100644 index 2d7f08f2afc..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/14_plus/update.sql +++ /dev/null @@ -1,70 +0,0 @@ -{% if data.name and o_data.name != data.name %} -ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{% if ((data.tfunction is defined or data.is_row_trigger is defined or data.evnt_insert is defined or data.evnt_delete is defined or data.evnt_update is defined or data.fires is defined or data.is_constraint_trigger is defined or data.whenclause is defined) and (o_data.tfunction != data.tfunction or data.is_row_trigger != o_data.is_row_trigger or data.evnt_insert != o_data.evnt_insert or data.evnt_delete != o_data.evnt_delete or data.evnt_update != o_data.evnt_update or o_data.fires != data.fires or data.is_constraint_trigger != o_data.is_constraint_trigger or data.whenclause != o_data.whenclause)) %} -{% set or_flag = False %} -{% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} -CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} -{% else %} -CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} -{% endif %} - {% if data.fires is defined %}{{data.fires}} {% else %}{{o_data.fires}} {% endif %}{% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_delete %} -{% if or_flag %} OR {% endif %}DELETE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_truncate is not defined %}{% if o_data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %} -{% endif %}{% else %}{% if data.evnt_truncate %} -{% if or_flag %} OR {% endif %}TRUNCATE{% set or_flag = True %}{%endif %}{% endif %}{% if data.evnt_update is not defined %}{% if o_data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if o_data.columns|length > 0 %}OF {% for c in o_data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %} -{% endif %}{% else %}{% if data.evnt_update %} -{% if or_flag %} OR {% endif %}UPDATE {% if data.columns|length > 0 %}OF {% for c in data.columns %}{% if loop.index != 1 %}, {% endif %}{{ conn|qtIdent(c) }}{% endfor %}{% endif %}{% endif %} -{% endif %} - - ON {{ conn|qtIdent(data.schema, data.table) }} -{% if data.tgdeferrable %} - DEFERRABLE{% if data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% elif o_data.tgdeferrable %} - DEFERRABLE{% if o_data.tginitdeferred %} INITIALLY DEFERRED{% endif %} - -{% endif %}{% if data.is_row_trigger is not defined %} - FOR EACH{% if o_data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% else %} - FOR EACH{% if data.is_row_trigger %} ROW{% else %} STATEMENT{% endif %} {% endif %} - -{% if data.whenclause %} - WHEN {{ data.whenclause }} -{% elif o_data.whenclause %} - WHEN {{ o_data.whenclause }} -{% endif %} - -{%if data.tfunction == 'Inline EDB-SPL' %} -{% if (data.prosrc is not defined) %} -{{ o_data.prosrc }}; -{% else %} -{{ data.prosrc }}; -{% endif %} -{% else %} -{% if (data.tfunction is defined) %} - EXECUTE FUNCTION {{ data.tfunction }}{% if data.tgargs %}({{ data.tgargs }}){% else %}(){% endif%}; -{% else %} - EXECUTE FUNCTION {{ o_data.tfunction }}{% if o_data.tgargs %}({{ o_data.tgargs }}){% else %}(){% endif%}; -{% endif %} -{% endif %} - -{% if data.description is not defined and o_data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{o_data.description|qtLiteral(conn)}}; -{% endif %} -{% endif %} -{% if data.description is defined and o_data.description != data.description %} -COMMENT ON TRIGGER {{ conn|qtIdent(data.name) }} ON {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{% if data.is_enable_trigger is defined and o_data.is_enable_trigger != data.is_enable_trigger %} -{% set enable_map = {'R':'ENABLE REPLICA', 'A':'ENABLE ALWAYS', 'O':'ENABLE', 'D':'DISABLE'} %} -ALTER TABLE {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - {{ enable_map[data.is_enable_trigger] }} TRIGGER {{ conn|qtIdent(data.name) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/count.sql index 74f54929e9b..b17aaf7cb02 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/count.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/count.sql @@ -1,4 +1,5 @@ SELECT COUNT(*) FROM pg_catalog.pg_trigger t -WHERE NOT tgisinternal + WHERE NOT tgisinternal AND tgrelid = {{tid}}::OID + AND tgpackageoid = 0 diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/create.sql index f3d7c207095..fb799ca9ea6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/create.sql @@ -3,7 +3,7 @@ {% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} +CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} {% endif %} {{data.fires}} {% if data.evnt_insert %}INSERT{% set or_flag = True %} {% endif %}{% if data.evnt_delete %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/nodes.sql index 183ff742c3c..700da637f64 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/nodes.sql @@ -1,8 +1,9 @@ SELECT t.oid, t.tgname as name, t.tgenabled AS is_enable_trigger, des.description FROM pg_catalog.pg_trigger t LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_trigger'::regclass) -WHERE NOT tgisinternal + WHERE NOT tgisinternal AND tgrelid = {{tid}}::OID + AND tgpackageoid = 0 {% if trid %} AND t.oid = {{trid}}::OID {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/properties.sql index 9c936c57874..a04ad8f8f0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/properties.sql @@ -18,6 +18,7 @@ FROM pg_catalog.pg_trigger t LEFT OUTER JOIN pg_catalog.pg_language l ON l.oid=p.prolang WHERE NOT tgisinternal AND tgrelid = {{tid}}::OID + AND tgpackageoid = 0 {% if trid %} AND t.oid = {{trid}}::OID {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/update.sql index 8f99d632d8f..2d7f08f2afc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/ppas/default/update.sql @@ -8,7 +8,7 @@ ALTER TRIGGER {{ conn|qtIdent(o_data.name) }} ON {{ conn|qtIdent(o_data.nspname, {% if data.lanname == 'edbspl' or data.tfunction == 'Inline EDB-SPL' %} CREATE OR REPLACE TRIGGER {{ conn|qtIdent(data.name) }} {% else %} -CREATE{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} +CREATE{% if not data.is_constraint_trigger %} OR REPLACE{% endif %}{% if data.is_constraint_trigger %} CONSTRAINT{% endif %} TRIGGER {{ conn|qtIdent(data.name) }} {% endif %} {% if data.fires is defined %}{{data.fires}} {% else %}{{o_data.fires}} {% endif %}{% if data.evnt_insert is not defined %}{% if o_data.evnt_insert %}INSERT{% set or_flag = True %} {% endif %}{% else %}{% if data.evnt_insert %}INSERT{% set or_flag = True %}{% endif %}{% endif %}{% if data.evnt_delete is not defined %}{% if o_data.evnt_delete %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table.sql deleted file mode 100644 index a09505553c2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table.sql +++ /dev/null @@ -1,33 +0,0 @@ --- Table: public.table_with_custom_autovaccum_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[] COLLATE pg_catalog."default", - col2 date -) -WITH ( - OIDS = FALSE, - toast.autovacuum_enabled = FALSE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 60, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 100, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table_msql.sql deleted file mode 100644 index f8cf5a96808..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/alter_table_with_toast_table_msql.sql +++ /dev/null @@ -1,14 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - autovacuum_analyze_threshold = 60, - autovacuum_vacuum_cost_limit = 100 -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" RESET ( - autovacuum_enabled -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - toast.autovacuum_enabled = false, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql deleted file mode 100644 index 698694eae0b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Table: public.partition_table_with_collate_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - --- Partitions SQL - -CREATE TABLE public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_arr_small - OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql deleted file mode 100644 index 8583dcbdf67..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_partition_table_with_collate_msql.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -); - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - -CREATE TABLE public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25'); - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition.sql deleted file mode 100644 index 20fdc987e94..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Table: public.table_with_hash_patition_$%{}[]()&*^!@\"'`\\/# - --- DROP TABLE IF EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" -( - id bigint, - name text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY HASH (id) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - IS 'hash partition'; - --- Partitions SQL - -CREATE TABLE public.cust_part11 PARTITION OF public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - FOR VALUES WITH (modulus 2, remainder 1) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_part11 - OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition_msql.sql deleted file mode 100644 index 610b23645a8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/create_table_with_hash_partition_msql.sql +++ /dev/null @@ -1,18 +0,0 @@ -CREATE TABLE public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" -( - id bigint, - name text, - arr numeric -) PARTITION BY HASH (id) -WITH ( - OIDS = FALSE -); - -ALTER TABLE IF EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - IS 'hash partition'; - -CREATE TABLE public.cust_part11 PARTITION OF public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - FOR VALUES WITH (MODULUS 2, REMAINDER 1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/test.json deleted file mode 100644 index 199cd98094a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/11_plus/test.json +++ /dev/null @@ -1,2149 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table without primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "boolean", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 20, - "attprecision": 10, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "timestamp with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_without_primary_key.sql", - "expected_msql_file": "create_table_without_primary_key_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data types", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "cltype": "bigint" - }, - { - "attnum": 2, - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "cltype": "character varying" - }, - { - "attnum": 6, - "attlen": null, - "cltype": "time without time zone" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_data_type.sql", - "expected_msql_file": "alter_table_change_col_data_type_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add pk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attnotnull": true, - "is_primary_key": true - } - ] - }, - "primary_key": { - "added": [ - { - "columns": [ - { - "column": "col1" - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_pk_not_null_constraint.sql", - "expected_msql_file": "alter_table_add_pk_not_null_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add null constraint, rename column", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "name": "col1_rename", - "is_primary_key": false - }, - { - "attnum": 4, - "attnotnull": true - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_null_constraint_rename_col.sql", - "expected_msql_file": "alter_table_add_null_constraint_rename_col_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table add pk", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "integer", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "json", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk.sql", - "expected_msql_file": "create_table_with_pk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "added": [ - { - "name": "col3_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": 5, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_cols.sql", - "expected_msql_file": "alter_table_add_cols_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "deleted": [ - { - "attoptions": [], - "attacl": [], - "seclabels": [], - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "atttypid": 114, - "attnum": 2, - "cltype": "json", - "collspcname": "", - "description": null, - "edit_types": [ - "json", - "jsonb" - ], - "is_primary_key": false, - "attstattarget": -1, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attndims": 0, - "atttypmod": -1, - "attstorage": "x", - "defval": null, - "typname": "json", - "displaytypname": "json", - "elemoid": 114, - "typnspname": "pg_catalog", - "defaultstorage": "x", - "indkey": "1", - "isdup": false, - "is_fk": false, - "is_sys_column": false, - "relname": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "is_view_only": false, - "is_pk": false, - "old_attidentity": "a" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_delete_cols.sql", - "expected_msql_file": "alter_table_delete_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table delete columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with pk & check constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "create table comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "name": "custom_pk", - "comment": "custom pk created", - "fillfactor": "11", - "condeferrable": true, - "condeferred": true, - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "time with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "character", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 12, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [ - { - "name": "chk_const", - "consrc": "col2 != null", - "convalidated": false, - "comment": "chk const comment" - } - ], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk_chk.sql", - "expected_msql_file": "create_table_with_pk_chk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add unique constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "unique_constraint": { - "added": [ - { - "name": "unique", - "fillfactor": "13", - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_unique_const.sql", - "expected_msql_file": "alter_table_add_unique_const_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete constraints", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "check_constraint": { - "deleted": [ - { - "name": "chk_const", - "consrc": "col2 <> NULL::bpchar", - "connoinherit": false, - "convalidated": false, - "relname": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "nspname": "public", - "comment": "chk const comment", - "conislocal": true - } - ] - }, - "unique_constraint": { - "deleted": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"\"'`\\\\/#" - } - ], - "name": "unique", - "comment": null, - "spcname": "pg_default", - "fillfactor": "13", - "condeferrable": false, - "condeferred": false, - "include": [], - "col_count": 1, - "conislocal": true - } - ] - } - }, - "expected_sql_file": "alter_table_delete_constraints.sql", - "expected_msql_file": "alter_table_delete_constraints_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with pk & chk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for FK reference", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "fk_reference_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "bigint" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table with fk constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [ - { - "name": "fk_test", - "comment": "fk comment", - "condeferrable": true, - "confmatchtype": true, - "columns": [ - { - "local_column": "col1", - "references": "", - "referenced": "id" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_fk.sql", - "expected_msql_file": "create_table_with_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add one more fk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "foreign_key": { - "added": [ - { - "name": "fk2", - "columns": [ - { - "local_column": "col2", - "references": "", - "referenced": "name" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_another_fk.sql", - "expected_msql_file": "alter_table_add_another_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add exclude constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "exclude_constraint": { - "added": [ - { - "name": "ex_constr", - "amname": "btree", - "columns": [ - { - "column": "col1", - "is_exp": false, - "order": false, - "nulls_order": false, - "operator": "=", - "is_sort_nulls_applicable": false - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_exclude_constraint.sql", - "expected_msql_file": "alter_table_add_exclude_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with custom auto-vacuum", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "custom auto vacuum", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "t", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "character varying[]", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "date", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - }, - { - "name": "autovacuum_analyze_threshold", - "value": 55 - }, - { - "name": "autovacuum_freeze_max_age", - "value": 20000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 25 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 10 - }, - { - "name": "autovacuum_vacuum_scale_factor", - "value": 0.3 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 60 - }, - { - "name": "autovacuum_freeze_min_age", - "value": 500000 - }, - { - "name": "autovacuum_freeze_table_age", - "value": 1300000 - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_custom_autovacuum.sql", - "expected_msql_file": "create_table_with_custom_autovacuum_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add toast table", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "autovacuum_enabled": "x", - "toast_autovacuum": true, - "toast_autovacuum_enabled": "f", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_threshold", - "value": 60 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 100 - } - ] - }, - "vacuum_toast": { - "changed": [ - { - "name": "autovacuum_freeze_max_age", - "value": 2000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 50 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 13 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 70 - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_with_toast_table.sql", - "expected_msql_file": "alter_table_with_toast_table_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with advanced options", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "relhasoids": true, - "description": "test comment", - "relpersistence": true, - "fillfactor": "50", - "parallel_workers": "", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "double precision", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "numrange", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": true, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "rlspolicy": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_advanced_options.sql", - "expected_msql_file": "create_table_with_advanced_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table update grants", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "rlspolicy": false, - "forcerlspolicy": false, - "relacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_update_grants.sql", - "expected_msql_file": "alter_table_update_grants_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "like_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table using like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test ", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": true, - "like_constraints": true, - "like_indexes": true, - "like_storage": true, - "like_comments": true, - "like_identity": true, - "like_statistics": true, - "like_relation": "public.like_tbl" - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_lik_tbl.sql", - "expected_msql_file": "create_table_with_lik_tbl_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with list partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_active", - "values_in": "'ACTIVE'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "list", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with list partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small PARTITION", - "values_from": "20", - "values_to": "25", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "arr" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_range_partition.sql", - "expected_msql_file": "create_table_with_range_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with range partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with hash partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", - "relowner": "", - "relacl": [], - "description": "hash partition", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_part11", - "values_modulus": "2", - "values_remainder": "1", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "hash", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "name", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "id" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_hash_partition.sql", - "expected_msql_file": "create_table_with_hash_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with hash partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition with collate and opclass", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small", - "values_from": "'20'", - "values_to": "'25'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status", - "collationame": "\"C\"", - "op_class": "text_pattern_ops" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_partition_table_with_collate.sql", - "expected_msql_file": "create_partition_table_with_collate_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk.sql deleted file mode 100644 index 0d79c007357..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk.sql +++ /dev/null @@ -1,31 +0,0 @@ --- Table: public.table_with_fk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text COLLATE pg_catalog."default", - CONSTRAINT fk2 FOREIGN KEY (col2) - REFERENCES public.fk_reference_tbl (name) MATCH SIMPLE - ON UPDATE NO ACTION - ON DELETE NO ACTION - NOT VALID, - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk_msql.sql deleted file mode 100644 index f1cc9a21c5a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_another_fk_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - ADD CONSTRAINT fk2 FOREIGN KEY (col2) - REFERENCES public.fk_reference_tbl (name) - ON UPDATE NO ACTION - ON DELETE NO ACTION - NOT VALID; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols.sql deleted file mode 100644 index a5564eebc9f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols.sql +++ /dev/null @@ -1,20 +0,0 @@ --- Table: public.simple_table_with_pk$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer NOT NULL, - "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, - "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10,5), - "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", - CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols_msql.sql deleted file mode 100644 index 43b57e4e65c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_cols_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10, 5); - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col4_$%{}[]()&*^!@\""'`\\/#" text; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint.sql deleted file mode 100644 index 90728cf2b7b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint.sql +++ /dev/null @@ -1,34 +0,0 @@ --- Table: public.table_with_fk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text COLLATE pg_catalog."default", - CONSTRAINT fk2 FOREIGN KEY (col2) - REFERENCES public.fk_reference_tbl (name) MATCH SIMPLE - ON UPDATE NO ACTION - ON DELETE NO ACTION - NOT VALID, - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE, - CONSTRAINT ex_constr EXCLUDE USING btree ( - col1 WITH =) - -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint_msql.sql deleted file mode 100644 index 87ec4602216..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_exclude_constraint_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - ADD CONSTRAINT ex_constr EXCLUDE USING btree ( - col1 WITH =); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col.sql deleted file mode 100644 index 57fe64a0283..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1_rename bigint NOT NULL, - col2 character varying COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default" NOT NULL, - col5 numeric(20,10), - col6 time(5) without time zone, - CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1_rename) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col_msql.sql deleted file mode 100644 index 6da62563044..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_null_constraint_rename_col_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - RENAME col1 TO col1_rename; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col4 SET NOT NULL; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint.sql deleted file mode 100644 index 35522cab9f1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 bigint NOT NULL, - col2 character varying COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default", - col5 numeric(20,10), - col6 time(5) without time zone, - CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint_msql.sql deleted file mode 100644 index 265a86abd58..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_pk_not_null_constraint_msql.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col1 SET NOT NULL; -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - ADD PRIMARY KEY (col1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const.sql deleted file mode 100644 index d082d1d31c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const.sql +++ /dev/null @@ -1,28 +0,0 @@ --- Table: public.table_with_pk_chk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone NOT NULL, - col2 character(12) COLLATE pg_catalog."default", - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED, - CONSTRAINT "unique" UNIQUE ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=13), - CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; - -COMMENT ON CONSTRAINT chk_const ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'chk const comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const_msql.sql deleted file mode 100644 index 8bc96855a9c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_unique_const_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - ADD CONSTRAINT "unique" UNIQUE ("col1_$%{}[]()&*^!@\""'`\\/#") - WITH (FILLFACTOR=13); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type.sql deleted file mode 100644 index 56b1874b7f9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 bigint, - col2 character varying COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default", - col5 numeric(20,10), - col6 time(5) without time zone -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type_msql.sql deleted file mode 100644 index 290f242443f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_change_col_data_type_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col1 TYPE bigint; - -ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col2 TYPE character varying COLLATE pg_catalog."default"; - -ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col6 TYPE time(5) without time zone ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols.sql deleted file mode 100644 index 5c5f52eb025..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Table: public.simple_table_with_pk$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer NOT NULL, - "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10,5), - "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", - CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols_msql.sql deleted file mode 100644 index 4f7f5c7693a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_cols_msql.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col2_$%{}[]()&*^!@\""'`\\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints.sql deleted file mode 100644 index 101d0ca4aa4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.table_with_pk_chk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone NOT NULL, - col2 character(12) COLLATE pg_catalog."default", - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints_msql.sql deleted file mode 100644 index ad937b1547e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_delete_constraints_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" DROP CONSTRAINT IF EXISTS "unique"; -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" DROP CONSTRAINT IF EXISTS chk_const; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants.sql deleted file mode 100644 index afadbb0740b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_advanced_options_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#"; - -CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" -( - col1 double precision, - col2 numrange -) - -WITH ( - FILLFACTOR = 50 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -REVOKE ALL ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" FROM PUBLIC; - -GRANT SELECT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT ALL ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" TO ; - -COMMENT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants_msql.sql deleted file mode 100644 index ed686217a1d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_update_grants_msql.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - DISABLE ROW LEVEL SECURITY; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - NO FORCE ROW LEVEL SECURITY; - -GRANT SELECT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table.sql deleted file mode 100644 index 39d22ab3cf8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table.sql +++ /dev/null @@ -1,33 +0,0 @@ --- Table: public.table_with_custom_autovaccum_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[] COLLATE pg_catalog."default", - col2 date -) - -WITH ( - toast.autovacuum_enabled = FALSE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 60, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 100, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table_msql.sql deleted file mode 100644 index f8cf5a96808..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_with_toast_table_msql.sql +++ /dev/null @@ -1,14 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - autovacuum_analyze_threshold = 60, - autovacuum_vacuum_cost_limit = 100 -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" RESET ( - autovacuum_enabled -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - toast.autovacuum_enabled = false, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate.sql deleted file mode 100644 index 8bd88163d3f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Table: public.partition_table_with_collate_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - --- Partitions SQL - -CREATE TABLE public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_arr_small - OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate_msql.sql deleted file mode 100644 index d03cbc5f26e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_partition_table_with_collate_msql.sql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - -CREATE TABLE public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25'); - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options.sql deleted file mode 100644 index af813fb5c1f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_advanced_options_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#"; - -CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" -( - col1 double precision, - col2 numrange -) - -WITH ( - FILLFACTOR = 50 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - ENABLE ROW LEVEL SECURITY; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - FORCE ROW LEVEL SECURITY; - -COMMENT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options_msql.sql deleted file mode 100644 index 31f3173803c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_advanced_options_msql.sql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE UNLOGGED TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" -( - col1 double precision, - col2 numrange -) - -WITH ( - FILLFACTOR = 50 -); - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - ENABLE ROW LEVEL SECURITY; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - FORCE ROW LEVEL SECURITY; - -COMMENT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum.sql deleted file mode 100644 index f19ca73151c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Table: public.table_with_custom_autovaccum_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[] COLLATE pg_catalog."default", - col2 date -) - -WITH ( - autovacuum_enabled = TRUE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 55, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 10, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum_msql.sql deleted file mode 100644 index 2b49a51028d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_custom_autovacuum_msql.sql +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[], - col2 date -) - -WITH ( - autovacuum_enabled = TRUE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 55, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 10, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000 -); - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk.sql deleted file mode 100644 index c815289dee9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_fk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text COLLATE pg_catalog."default", - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk_msql.sql deleted file mode 100644 index 429ab68d37b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_fk_msql.sql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text, - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE - NOT VALID -); - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl.sql deleted file mode 100644 index d4a2b173cff..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Table: public.table_like_tbl$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" -( - id integer NOT NULL, - name text COLLATE pg_catalog."default", - CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (id), - CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_name_key" UNIQUE (name) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" - IS 'test '; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl_msql.sql deleted file mode 100644 index 8b82e3dbf5a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_lik_tbl_msql.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" -( - LIKE public.like_tbl - INCLUDING DEFAULTS - INCLUDING CONSTRAINTS - INCLUDING INDEXES - INCLUDING STORAGE - INCLUDING COMMENTS - INCLUDING GENERATED - INCLUDING IDENTITY - INCLUDING STATISTICS - -); - -ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" - IS 'test '; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition.sql deleted file mode 100644 index f281bf0dbea..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Table: public.table_with_patition_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY LIST (status); - -ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - --- Partitions SQL - -CREATE TABLE public.cust_active PARTITION OF public."table_with_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES IN ('ACTIVE') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_active - OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition_msql.sql deleted file mode 100644 index 6c22990ffff..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_partition_msql.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY LIST (status); - -ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - -CREATE TABLE public.cust_active PARTITION OF public."table_with_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES IN ('ACTIVE'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk.sql deleted file mode 100644 index 95bd2896138..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk.sql +++ /dev/null @@ -1,18 +0,0 @@ --- Table: public.simple_table_with_pk$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer NOT NULL, - "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, - CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk.sql deleted file mode 100644 index 8db3c072f97..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_pk_chk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone NOT NULL, - col2 character(12) COLLATE pg_catalog."default", - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED, - CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; - -COMMENT ON CONSTRAINT chk_const ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'chk const comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk_msql.sql deleted file mode 100644 index 2b4db7c91bc..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_chk_msql.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone, - col2 character(12), - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED, - CONSTRAINT chk_const CHECK (col2 != null) -); - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; - -COMMENT ON CONSTRAINT chk_const ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'chk const comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_msql.sql deleted file mode 100644 index 0e778cd33ae..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_pk_msql.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer, - "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, - PRIMARY KEY ("col1_$%{}[]()&*^!@\""'`\\/#") -); - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition.sql deleted file mode 100644 index 99c116880a6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.table_with_range_patition_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY RANGE (arr); - -ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - OWNER to ; - --- Partitions SQL - -CREATE TABLE public."cust_arr_small PARTITION" PARTITION OF public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."cust_arr_small PARTITION" - OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition_msql.sql deleted file mode 100644 index 5b96cb8e833..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_range_partition_msql.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY RANGE (arr); - -ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -CREATE TABLE public."cust_arr_small PARTITION" PARTITION OF public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM (20) TO (25); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key.sql deleted file mode 100644 index 5a3a5cd5c0d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 text COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default", - col5 numeric(20,10), - col6 timestamp(5) with time zone -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key_msql.sql deleted file mode 100644 index 77f89653220..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_without_primary_key_msql.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 text, - col3 boolean, - col4 character varying(30), - col5 numeric(20, 10), - col6 timestamp(5) with time zone -); - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json deleted file mode 100644 index 96467ac9f89..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/test.json +++ /dev/null @@ -1,2255 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table without primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "boolean", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 20, - "attprecision": 10, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "timestamp with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_without_primary_key.sql", - "expected_msql_file": "create_table_without_primary_key_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data types", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "cltype": "bigint" - }, - { - "attnum": 2, - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "cltype": "character varying" - }, - { - "attnum": 6, - "attlen": null, - "cltype": "time without time zone" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_data_type.sql", - "expected_msql_file": "alter_table_change_col_data_type_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add pk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attnotnull": true, - "is_primary_key": true - } - ] - }, - "primary_key": { - "added": [ - { - "columns": [ - { - "column": "col1" - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_pk_not_null_constraint.sql", - "expected_msql_file": "alter_table_add_pk_not_null_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add null constraint, rename column", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "name": "col1_rename", - "is_primary_key": false - }, - { - "attnum": 4, - "attnotnull": true - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_null_constraint_rename_col.sql", - "expected_msql_file": "alter_table_add_null_constraint_rename_col_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table add pk", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "integer", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "json", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk.sql", - "expected_msql_file": "create_table_with_pk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "added": [ - { - "name": "col3_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": 5, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_cols.sql", - "expected_msql_file": "alter_table_add_cols_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "deleted": [ - { - "attoptions": [], - "attacl": [], - "seclabels": [], - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "atttypid": 114, - "attnum": 2, - "cltype": "json", - "collspcname": "", - "description": null, - "edit_types": [ - "json", - "jsonb" - ], - "is_primary_key": false, - "attstattarget": -1, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attndims": 0, - "atttypmod": -1, - "attstorage": "x", - "defval": null, - "typname": "json", - "displaytypname": "json", - "elemoid": 114, - "typnspname": "pg_catalog", - "defaultstorage": "x", - "indkey": "1", - "isdup": false, - "is_fk": false, - "is_sys_column": false, - "relname": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "is_view_only": false, - "is_pk": false, - "old_attidentity": "a" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_delete_cols.sql", - "expected_msql_file": "alter_table_delete_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table delete columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with pk & check constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "create table comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "name": "custom_pk", - "comment": "custom pk created", - "fillfactor": "11", - "condeferrable": true, - "condeferred": true, - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "time with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "character", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 12, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [ - { - "name": "chk_const", - "consrc": "col2 != null", - "convalidated": false, - "comment": "chk const comment" - } - ], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk_chk.sql", - "expected_msql_file": "create_table_with_pk_chk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add unique constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "unique_constraint": { - "added": [ - { - "name": "unique", - "fillfactor": "13", - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_unique_const.sql", - "expected_msql_file": "alter_table_add_unique_const_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete constraints", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "check_constraint": { - "deleted": [ - { - "name": "chk_const", - "consrc": "col2 <> NULL::bpchar", - "connoinherit": false, - "convalidated": false, - "relname": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "nspname": "public", - "comment": "chk const comment", - "conislocal": true - } - ] - }, - "unique_constraint": { - "deleted": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"\"'`\\\\/#" - } - ], - "name": "unique", - "comment": null, - "spcname": "pg_default", - "fillfactor": "13", - "condeferrable": false, - "condeferred": false, - "include": [], - "col_count": 1, - "conislocal": true - } - ] - } - }, - "expected_sql_file": "alter_table_delete_constraints.sql", - "expected_msql_file": "alter_table_delete_constraints_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with pk & chk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for FK reference", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "fk_reference_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "bigint" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table with fk constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [ - { - "name": "fk_test", - "comment": "fk comment", - "condeferrable": true, - "confmatchtype": true, - "columns": [ - { - "local_column": "col1", - "references": "", - "referenced": "id" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_fk.sql", - "expected_msql_file": "create_table_with_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add one more fk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "foreign_key": { - "added": [ - { - "name": "fk2", - "columns": [ - { - "local_column": "col2", - "references": "", - "referenced": "name" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_another_fk.sql", - "expected_msql_file": "alter_table_add_another_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add exclude constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "exclude_constraint": { - "added": [ - { - "name": "ex_constr", - "amname": "btree", - "columns": [ - { - "column": "col1", - "is_exp": false, - "order": false, - "nulls_order": false, - "operator": "=", - "is_sort_nulls_applicable": false - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_exclude_constraint.sql", - "expected_msql_file": "alter_table_add_exclude_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with custom auto-vacuum", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "custom auto vacuum", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "t", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "character varying[]", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "date", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - }, - { - "name": "autovacuum_analyze_threshold", - "value": 55 - }, - { - "name": "autovacuum_freeze_max_age", - "value": 20000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 25 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 10 - }, - { - "name": "autovacuum_vacuum_scale_factor", - "value": 0.3 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 60 - }, - { - "name": "autovacuum_freeze_min_age", - "value": 500000 - }, - { - "name": "autovacuum_freeze_table_age", - "value": 1300000 - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_custom_autovacuum.sql", - "expected_msql_file": "create_table_with_custom_autovacuum_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add toast table", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "autovacuum_enabled": "x", - "toast_autovacuum": true, - "toast_autovacuum_enabled": "f", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_threshold", - "value": 60 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 100 - } - ] - }, - "vacuum_toast": { - "changed": [ - { - "name": "autovacuum_freeze_max_age", - "value": 2000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 50 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 13 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 70 - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_with_toast_table.sql", - "expected_msql_file": "alter_table_with_toast_table_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with advanced options", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "relhasoids": true, - "description": "test comment", - "relpersistence": true, - "fillfactor": "50", - "parallel_workers": "", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "double precision", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "numrange", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": true, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "rlspolicy": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_advanced_options.sql", - "expected_msql_file": "create_table_with_advanced_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table update grants", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "rlspolicy": false, - "forcerlspolicy": false, - "relacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_update_grants.sql", - "expected_msql_file": "alter_table_update_grants_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "like_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table using like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test ", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": true, - "like_constraints": true, - "like_indexes": true, - "like_storage": true, - "like_comments": true, - "like_identity": true, - "like_statistics": true, - "like_generated": true, - "like_relation": "public.like_tbl" - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_lik_tbl.sql", - "expected_msql_file": "create_table_with_lik_tbl_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with list partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_active", - "values_in": "'ACTIVE'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "list", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with list partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small PARTITION", - "values_from": "20", - "values_to": "25", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "arr" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_range_partition.sql", - "expected_msql_file": "create_table_with_range_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with range partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with hash partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", - "relowner": "", - "relacl": [], - "description": "hash partition", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_part11", - "values_modulus": "2", - "values_remainder": "1", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "hash", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "name", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "id" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_hash_partition.sql", - "expected_msql_file": "create_table_with_hash_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with hash partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition with collate and opclass", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small", - "values_from": "'20'", - "values_to": "'25'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status", - "collationame": "\"C\"", - "op_class": "text_pattern_ops" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_partition_table_with_collate.sql", - "expected_msql_file": "create_partition_table_with_collate_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with serial columns", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_serial_cols", - "relowner": "", - "relacl": [], - "description": "round-trip SERIAL columns (issue #9896)", - "coll_inherits": "[]", - "hastoasttable": true, - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "id_serial", - "cltype": "serial", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "id_bigserial", - "cltype": "bigserial", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "id_smallserial", - "cltype": "smallserial", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "payload", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_serial_cols.sql", - "expected_msql_file": "create_table_with_serial_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with serial columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_serial_cols" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_lik_tbl_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_lik_tbl_msql.sql deleted file mode 100644 index fb94c33d49e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_lik_tbl_msql.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" -( - LIKE public.like_tbl - INCLUDING DEFAULTS - INCLUDING CONSTRAINTS - INCLUDING INDEXES - INCLUDING STORAGE - INCLUDING COMMENTS - INCLUDING COMPRESSION - INCLUDING GENERATED - INCLUDING IDENTITY - INCLUDING STATISTICS - -); - -ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" - OWNER to ; - -COMMENT ON TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" - IS 'test '; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols.sql deleted file mode 100644 index ea1daef6be2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Table: public.table_with_serial_cols - --- DROP TABLE IF EXISTS public.table_with_serial_cols; - -CREATE TABLE IF NOT EXISTS public.table_with_serial_cols -( - id_serial serial NOT NULL, - id_bigserial bigserial NOT NULL, - id_smallserial smallserial NOT NULL, - payload text COLLATE pg_catalog."default" -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.table_with_serial_cols - OWNER to ; - -COMMENT ON TABLE public.table_with_serial_cols - IS 'round-trip SERIAL columns (issue #9896)'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols_msql.sql deleted file mode 100644 index d87061672bf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_serial_cols_msql.sql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE TABLE public.table_with_serial_cols -( - id_serial serial NOT NULL, - id_bigserial bigserial NOT NULL, - id_smallserial smallserial NOT NULL, - payload text -); - -ALTER TABLE IF EXISTS public.table_with_serial_cols - OWNER to ; - -COMMENT ON TABLE public.table_with_serial_cols - IS 'round-trip SERIAL columns (issue #9896)'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/test.json deleted file mode 100644 index f014519244d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/test.json +++ /dev/null @@ -1,2387 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table without primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "boolean", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 20, - "attprecision": 10, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "timestamp with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_without_primary_key.sql", - "expected_msql_file": "create_table_without_primary_key_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data types", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "cltype": "bigint" - }, - { - "attnum": 2, - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "cltype": "character varying" - }, - { - "attnum": 6, - "attlen": null, - "cltype": "time without time zone" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_data_type.sql", - "expected_msql_file": "alter_table_change_col_data_type_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add pk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attnotnull": true, - "is_primary_key": true - } - ] - }, - "primary_key": { - "added": [ - { - "columns": [ - { - "column": "col1" - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_pk_not_null_constraint.sql", - "expected_msql_file": "alter_table_add_pk_not_null_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add null constraint, rename column", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "name": "col1_rename", - "is_primary_key": false - }, - { - "attnum": 4, - "attnotnull": true - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_null_constraint_rename_col.sql", - "expected_msql_file": "alter_table_add_null_constraint_rename_col_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table add pk", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "integer", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "json", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk.sql", - "expected_msql_file": "create_table_with_pk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "added": [ - { - "name": "col3_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": 5, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_cols.sql", - "expected_msql_file": "alter_table_add_cols_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "deleted": [ - { - "attoptions": [], - "attacl": [], - "seclabels": [], - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "atttypid": 114, - "attnum": 2, - "cltype": "json", - "collspcname": "", - "description": null, - "edit_types": [ - "json", - "jsonb" - ], - "is_primary_key": false, - "attstattarget": -1, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attndims": 0, - "atttypmod": -1, - "attstorage": "x", - "defval": null, - "typname": "json", - "displaytypname": "json", - "elemoid": 114, - "typnspname": "pg_catalog", - "defaultstorage": "x", - "indkey": "1", - "isdup": false, - "is_fk": false, - "is_sys_column": false, - "relname": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "is_view_only": false, - "is_pk": false, - "old_attidentity": "a" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_delete_cols.sql", - "expected_msql_file": "alter_table_delete_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table delete columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with pk & check constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "create table comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "name": "custom_pk", - "comment": "custom pk created", - "fillfactor": "11", - "condeferrable": true, - "condeferred": true, - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "time with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "character", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 12, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [ - { - "name": "chk_const", - "consrc": "col2 != null", - "convalidated": false, - "comment": "chk const comment" - } - ], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk_chk.sql", - "expected_msql_file": "create_table_with_pk_chk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add unique constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "unique_constraint": { - "added": [ - { - "name": "unique", - "fillfactor": "13", - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_unique_const.sql", - "expected_msql_file": "alter_table_add_unique_const_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete constraints", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "check_constraint": { - "deleted": [ - { - "name": "chk_const", - "consrc": "col2 <> NULL::bpchar", - "connoinherit": false, - "convalidated": false, - "relname": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "nspname": "public", - "comment": "chk const comment", - "conislocal": true - } - ] - }, - "unique_constraint": { - "deleted": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"\"'`\\\\/#" - } - ], - "name": "unique", - "comment": null, - "spcname": "pg_default", - "fillfactor": "13", - "condeferrable": false, - "condeferred": false, - "include": [], - "col_count": 1, - "conislocal": true - } - ] - } - }, - "expected_sql_file": "alter_table_delete_constraints.sql", - "expected_msql_file": "alter_table_delete_constraints_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with pk & chk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for FK reference", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "fk_reference_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "bigint" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table with fk constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [ - { - "name": "fk_test", - "comment": "fk comment", - "condeferrable": true, - "confmatchtype": true, - "columns": [ - { - "local_column": "col1", - "references": "", - "referenced": "id" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_fk.sql", - "expected_msql_file": "create_table_with_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add one more fk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "foreign_key": { - "added": [ - { - "name": "fk2", - "columns": [ - { - "local_column": "col2", - "references": "", - "referenced": "name" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_another_fk.sql", - "expected_msql_file": "alter_table_add_another_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add exclude constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "exclude_constraint": { - "added": [ - { - "name": "ex_constr", - "amname": "btree", - "columns": [ - { - "column": "col1", - "is_exp": false, - "order": false, - "nulls_order": false, - "operator": "=", - "is_sort_nulls_applicable": false - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_exclude_constraint.sql", - "expected_msql_file": "alter_table_add_exclude_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with custom auto-vacuum", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "custom auto vacuum", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "t", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "character varying[]", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "date", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - }, - { - "name": "autovacuum_analyze_threshold", - "value": 55 - }, - { - "name": "autovacuum_freeze_max_age", - "value": 20000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 25 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 10 - }, - { - "name": "autovacuum_vacuum_scale_factor", - "value": 0.3 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 60 - }, - { - "name": "autovacuum_freeze_min_age", - "value": 500000 - }, - { - "name": "autovacuum_freeze_table_age", - "value": 1300000 - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_custom_autovacuum.sql", - "expected_msql_file": "create_table_with_custom_autovacuum_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add toast table", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "autovacuum_enabled": "x", - "toast_autovacuum": true, - "toast_autovacuum_enabled": "f", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_threshold", - "value": 60 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 100 - } - ] - }, - "vacuum_toast": { - "changed": [ - { - "name": "autovacuum_freeze_max_age", - "value": 2000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 50 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 13 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 70 - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_with_toast_table.sql", - "expected_msql_file": "alter_table_with_toast_table_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with advanced options", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "relhasoids": true, - "description": "test comment", - "relpersistence": true, - "fillfactor": "50", - "parallel_workers": "", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "double precision", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "numrange", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": true, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "rlspolicy": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_advanced_options.sql", - "expected_msql_file": "create_table_with_advanced_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table update grants", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "rlspolicy": false, - "forcerlspolicy": false, - "relacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_update_grants.sql", - "expected_msql_file": "alter_table_update_grants_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "like_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table using like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test ", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": true, - "like_constraints": true, - "like_indexes": true, - "like_storage": true, - "like_comments": true, - "like_identity": true, - "like_statistics": true, - "like_generated": true, - "like_compression": true, - "like_relation": "public.like_tbl" - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_lik_tbl.sql", - "expected_msql_file": "create_table_with_lik_tbl_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with list partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_active", - "values_in": "'ACTIVE'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "list", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with list partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small PARTITION", - "values_from": "20", - "values_to": "25", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "arr" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_range_partition.sql", - "expected_msql_file": "create_table_with_range_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with range partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with hash partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", - "relowner": "", - "relacl": [], - "description": "hash partition", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_part11", - "values_modulus": "2", - "values_remainder": "1", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "hash", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "name", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "id" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_hash_partition.sql", - "expected_msql_file": "create_table_with_hash_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with hash partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition with collate and opclass", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small", - "values_from": "'20'", - "values_to": "'25'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status", - "collationame": "\"C\"", - "op_class": "text_pattern_ops" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_partition_table_with_collate.sql", - "expected_msql_file": "create_partition_table_with_collate_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with compression columns", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", - "relowner": "", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "attcompression": "pglz", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "bit", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attidentity": "a", - "attcompression": "lz4", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [] - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_column_compression.sql", - "expected_msql_file": "create_table_with_column_compression_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column compression type", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attcompression": "lz4" - }, - { - "attnum": 2, - "attcompression": "pglz" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_comp.sql", - "expected_msql_file": "alter_table_change_col_comp_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data type and compression type", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 3, - "cltype": "character varying", - "attcompression": "lz4" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_type_comp.sql", - "expected_msql_file": "alter_table_change_col_type_comp_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with serial columns", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_serial_cols", - "relowner": "", - "relacl": [], - "description": "round-trip SERIAL columns (issue #9896)", - "coll_inherits": "[]", - "hastoasttable": true, - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "id_serial", - "cltype": "serial", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "id_bigserial", - "cltype": "bigserial", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "id_smallserial", - "cltype": "smallserial", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "payload", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_serial_cols.sql", - "expected_msql_file": "create_table_with_serial_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with serial columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_serial_cols" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_another_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_another_fk.sql index 18c58e9c322..0d79c007357 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_another_fk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_another_fk.sql @@ -18,9 +18,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/# ON DELETE NO ACTION DEFERRABLE ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols.sql index 7382411de64..a5564eebc9f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols.sql @@ -10,9 +10,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols_msql.sql index 38b9590f20d..43b57e4e65c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_cols_msql.sql @@ -1,5 +1,5 @@ ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10, 5); + ADD COLUMN "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10, 5); ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col4_$%{}[]()&*^!@\""'`\\/#" text; + ADD COLUMN "col4_$%{}[]()&*^!@\""'`\\/#" text; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_exclude_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_exclude_constraint.sql index 7f0b5111ceb..90728cf2b7b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_exclude_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_exclude_constraint.sql @@ -21,9 +21,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/# col1 WITH =) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_null_constraint_rename_col.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_null_constraint_rename_col.sql index 49bc85c710e..57fe64a0283 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_null_constraint_rename_col.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_null_constraint_rename_col.sql @@ -12,9 +12,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col6 time(5) without time zone, CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1_rename) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_partition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/alter_table_add_partition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_partition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_pk_not_null_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_pk_not_null_constraint.sql index 756cb8c1548..35522cab9f1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_pk_not_null_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_pk_not_null_constraint.sql @@ -12,9 +12,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col6 time(5) without time zone, CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_unique_const.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_unique_const.sql index 67667f8a140..d082d1d31c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_unique_const.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_add_unique_const.sql @@ -13,9 +13,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""' WITH (FILLFACTOR=13), CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_comp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_comp.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_comp.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_comp.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_comp_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_comp_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_comp_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_comp_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_data_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_data_type.sql index fcc7e3c0cf7..56b1874b7f9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_data_type.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_data_type.sql @@ -11,9 +11,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col5 numeric(20,10), col6 time(5) without time zone ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_type_comp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_type_comp.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_type_comp.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_type_comp.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_type_comp_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_type_comp_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/alter_table_change_col_type_comp_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_change_col_type_comp_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_cols.sql index 993676aca95..5c5f52eb025 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_cols.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_cols.sql @@ -9,9 +9,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_constraints.sql index b5d910f7bf8..101d0ca4aa4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_delete_constraints.sql @@ -10,9 +10,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""' WITH (FILLFACTOR=11) DEFERRABLE INITIALLY DEFERRED ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_update_grants.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_update_grants.sql index 1b634e65fb7..afadbb0740b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_update_grants.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_update_grants.sql @@ -7,8 +7,8 @@ CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]() col1 double precision, col2 numrange ) + WITH ( - OIDS = TRUE, FILLFACTOR = 50 ) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table.sql index a09505553c2..39d22ab3cf8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table.sql @@ -7,8 +7,8 @@ CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""' col1 character varying(10)[] COLLATE pg_catalog."default", col2 date ) + WITH ( - OIDS = FALSE, toast.autovacuum_enabled = FALSE, autovacuum_analyze_scale_factor = 0.2, autovacuum_analyze_threshold = 60, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table_msql.sql index 89a93acebe0..f8cf5a96808 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/alter_table_with_toast_table_msql.sql @@ -5,7 +5,6 @@ ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" RESET ( autovacuum_enabled ); - ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( toast.autovacuum_enabled = false, toast.autovacuum_freeze_max_age = 2000000, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate.sql index 698694eae0b..8bd88163d3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate.sql @@ -7,11 +7,7 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""' id integer, status text COLLATE pg_catalog."default", arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate_msql.sql index 8583dcbdf67..d03cbc5f26e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_partition_table_with_collate_msql.sql @@ -3,10 +3,7 @@ CREATE TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" id integer, status text, arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -); +) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options.sql index c61e9df21d0..af813fb5c1f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options.sql @@ -7,8 +7,8 @@ CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]() col1 double precision, col2 numrange ) + WITH ( - OIDS = TRUE, FILLFACTOR = 50 ) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options_msql.sql index 6bf9cc4a3a1..31f3173803c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_advanced_options_msql.sql @@ -3,8 +3,8 @@ CREATE UNLOGGED TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" col1 double precision, col2 numrange ) + WITH ( - OIDS = TRUE, FILLFACTOR = 50 ); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_column_compression.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_column_compression.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_column_compression.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_column_compression.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_column_compression_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_column_compression_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/14_plus/create_table_with_column_compression_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_column_compression_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum.sql index f90aa35c732..f19ca73151c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum.sql @@ -7,8 +7,8 @@ CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""' col1 character varying(10)[] COLLATE pg_catalog."default", col2 date ) + WITH ( - OIDS = FALSE, autovacuum_enabled = TRUE, autovacuum_analyze_scale_factor = 0.2, autovacuum_analyze_threshold = 55, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum_msql.sql index a737fb10691..2b49a51028d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_custom_autovacuum_msql.sql @@ -3,8 +3,8 @@ CREATE TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" col1 character varying(10)[], col2 date ) + WITH ( - OIDS = FALSE, autovacuum_enabled = TRUE, autovacuum_analyze_scale_factor = 0.2, autovacuum_analyze_threshold = 55, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk.sql index 2469c3cf7ae..c815289dee9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk.sql @@ -13,9 +13,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/# ON DELETE NO ACTION DEFERRABLE ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk_msql.sql index fd4334fd647..429ab68d37b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_fk_msql.sql @@ -9,9 +9,6 @@ CREATE TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" ON DELETE NO ACTION DEFERRABLE NOT VALID -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_hash_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_hash_partition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_hash_partition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_hash_partition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_hash_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_hash_partition_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_hash_partition_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_hash_partition_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl.sql index 9d730c5e91f..d4a2b173cff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl.sql @@ -9,9 +9,7 @@ CREATE TABLE IF NOT EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (id), CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_name_key" UNIQUE (name) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl_msql.sql index 5f0713e40af..fb94c33d49e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_lik_tbl_msql.sql @@ -6,12 +6,11 @@ CREATE TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" INCLUDING INDEXES INCLUDING STORAGE INCLUDING COMMENTS + INCLUDING COMPRESSION + INCLUDING GENERATED INCLUDING IDENTITY INCLUDING STATISTICS -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition.sql index 551f9680acb..f281bf0dbea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition.sql @@ -7,11 +7,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" id integer, status text COLLATE pg_catalog."default", arr numeric -) PARTITION BY LIST (status) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY LIST (status); ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition_msql.sql index 2ad15192c61..6c22990ffff 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_partition_msql.sql @@ -3,10 +3,7 @@ CREATE TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" id integer, status text, arr numeric -) PARTITION BY LIST (status) -WITH ( - OIDS = FALSE -); +) PARTITION BY LIST (status); ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk.sql index e402859b2bd..95bd2896138 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk.sql @@ -8,9 +8,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk.sql index fb2cfeaf804..8db3c072f97 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk.sql @@ -11,9 +11,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""' DEFERRABLE INITIALLY DEFERRED, CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk_msql.sql index f8e0ee85404..2b4db7c91bc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_chk_msql.sql @@ -6,9 +6,6 @@ CREATE TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" WITH (FILLFACTOR=11) DEFERRABLE INITIALLY DEFERRED, CONSTRAINT chk_const CHECK (col2 != null) -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_msql.sql index 9424d92343f..0e778cd33ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_pk_msql.sql @@ -3,9 +3,6 @@ CREATE TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col1_$%{}[]()&*^!@\""'`\\/#" integer, "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, PRIMARY KEY ("col1_$%{}[]()&*^!@\""'`\\/#") -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition.sql index c147f5aa757..99c116880a6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition.sql @@ -7,11 +7,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/ id integer, status text COLLATE pg_catalog."default", arr numeric -) PARTITION BY RANGE (arr) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (arr); ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition_msql.sql index 25cdf926227..5b96cb8e833 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_range_partition_msql.sql @@ -3,10 +3,7 @@ CREATE TABLE public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" id integer, status text, arr numeric -) PARTITION BY RANGE (arr) -WITH ( - OIDS = FALSE -); +) PARTITION BY RANGE (arr); ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" OWNER to ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_serial_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_serial_cols.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_serial_cols.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_serial_cols.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_serial_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_serial_cols_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/12_plus/create_table_with_serial_cols_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_with_serial_cols_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key.sql index 57ced999aee..5a3a5cd5c0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key.sql @@ -11,9 +11,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col5 numeric(20,10), col6 timestamp(5) with time zone ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key_msql.sql index debfb1d82b5..77f89653220 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/create_table_without_primary_key_msql.sql @@ -6,9 +6,6 @@ CREATE TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" col4 character varying(30), col5 numeric(20, 10), col6 timestamp(5) with time zone -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/test.json index 030ed169dac..f014519244d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/pg/default/test.json @@ -173,7 +173,9 @@ "like_storage": false, "like_comments": false, "like_identity": false, - "like_statistics": false + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "expected_sql_file": "create_table_without_primary_key.sql", @@ -401,7 +403,9 @@ "like_storage": false, "like_comments": false, "like_identity": false, - "like_statistics": false + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "expected_sql_file": "create_table_with_pk.sql", @@ -656,7 +660,9 @@ "like_storage": false, "like_comments": false, "like_identity": false, - "like_statistics": false + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "expected_sql_file": "create_table_with_pk_chk.sql", @@ -1492,6 +1498,8 @@ "like_comments": true, "like_identity": true, "like_statistics": true, + "like_generated": true, + "like_compression": true, "like_relation": "public.like_tbl" }, "store_object_id": true, @@ -1652,12 +1660,22 @@ "like_comments": false, "like_identity": false, "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": false }, "store_object_id": true, "expected_sql_file": "create_table_with_partition.sql", "expected_msql_file": "create_table_with_partition_msql.sql" }, + { + "type": "delete", + "name": "Delete Table with list partition", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" + } + }, { "type": "create", "name": "Create Table with range partition", @@ -1803,12 +1821,180 @@ "like_comments": false, "like_identity": false, "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": false }, "store_object_id": true, "expected_sql_file": "create_table_with_range_partition.sql", "expected_msql_file": "create_table_with_range_partition_msql.sql" }, + { + "type": "delete", + "name": "Delete Table with range partition", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Table with hash partition", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql", + "data": { + "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", + "relowner": "", + "relacl": [], + "description": "hash partition", + "coll_inherits": "[]", + "hastoasttable": true, + "toast_autovacuum_enabled": "x", + "autovacuum_enabled": "x", + "primary_key": [], + "partitions": [ + { + "is_attach": false, + "partition_name": "cust_part11", + "values_modulus": "2", + "values_remainder": "1", + "is_sub_partitioned": false, + "sub_partition_type": "range", + "sub_partition_keys": [] + } + ], + "partition_type": "hash", + "is_partitioned": true, + "schema": "public", + "columns": [ + { + "name": "id", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "name", + "cltype": "text", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "arr", + "cltype": "numeric", + "attacl": [], + "min_val_attlen": 1, + "min_val_attprecision": 0, + "max_val_attlen": 1000, + "max_val_attprecision": 1000, + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + } + ], + "foreign_key": [], + "check_constraint": [], + "unique_constraint": [], + "exclude_constraint": [], + "partition_keys": [ + { + "key_type": "column", + "pt_column": "id" + } + ], + "vacuum_table": [ + { + "name": "autovacuum_analyze_scale_factor" + }, + { + "name": "autovacuum_analyze_threshold" + }, + { + "name": "autovacuum_freeze_max_age" + }, + { + "name": "autovacuum_vacuum_cost_delay" + }, + { + "name": "autovacuum_vacuum_cost_limit" + }, + { + "name": "autovacuum_vacuum_scale_factor" + }, + { + "name": "autovacuum_vacuum_threshold" + }, + { + "name": "autovacuum_freeze_min_age" + }, + { + "name": "autovacuum_freeze_table_age" + } + ], + "vacuum_toast": [ + { + "name": "autovacuum_freeze_max_age" + }, + { + "name": "autovacuum_vacuum_cost_delay" + }, + { + "name": "autovacuum_vacuum_cost_limit" + }, + { + "name": "autovacuum_vacuum_scale_factor" + }, + { + "name": "autovacuum_vacuum_threshold" + }, + { + "name": "autovacuum_freeze_min_age" + }, + { + "name": "autovacuum_freeze_table_age" + } + ], + "seclabels": [], + "forcerlspolicy": false, + "like_default_value": false, + "like_constraints": false, + "like_indexes": false, + "like_storage": false, + "like_comments": false, + "autovacuum_custom": false + }, + "store_object_id": true, + "expected_sql_file": "create_table_with_hash_partition.sql", + "expected_msql_file": "create_table_with_hash_partition_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table with hash partition", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" + } + }, { "type": "create", "name": "Create Table with range partition with collate and opclass", @@ -1957,11 +2143,245 @@ "like_comments": false, "like_identity": false, "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": false }, "store_object_id": true, "expected_sql_file": "create_partition_table_with_collate.sql", "expected_msql_file": "create_partition_table_with_collate_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table ", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Table with compression columns", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", + "relowner": "", + "relacl": [], + "description": "test comment", + "coll_inherits": "[]", + "hastoasttable": true, + "toast_autovacuum_enabled": "x", + "autovacuum_enabled": "x", + "primary_key": [], + "partitions": [], + "is_partitioned": false, + "schema": "public", + "columns": [ + { + "name": "col4", + "cltype": "character varying", + "attacl": [], + "min_val_attlen": 1, + "max_val_attlen": 2147483647, + "is_primary_key": false, + "attnotnull": false, + "attlen": 30, + "attprecision": null, + "attidentity": "a", + "attcompression": "pglz", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "col5", + "cltype": "bit", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attidentity": "a", + "attcompression": "lz4", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "col6", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + } + ], + "foreign_key": [], + "check_constraint": [], + "unique_constraint": [], + "exclude_constraint": [], + "partition_keys": [] + }, + "store_object_id": true, + "expected_sql_file": "create_table_with_column_compression.sql", + "expected_msql_file": "create_table_with_column_compression_msql.sql" + }, + { + "type": "alter", + "name": "Alter Table to change column compression type", + "endpoint": "NODE-table.obj_id", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql_id", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", + "columns": { + "changed": [ + { + "attnum": 1, + "attcompression": "lz4" + }, + { + "attnum": 2, + "attcompression": "pglz" + } + ] + } + }, + "store_object_id": true, + "expected_sql_file": "alter_table_change_col_comp.sql", + "expected_msql_file": "alter_table_change_col_comp_msql.sql" + }, + { + "type": "alter", + "name": "Alter Table to change column data type and compression type", + "endpoint": "NODE-table.obj_id", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql_id", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", + "columns": { + "changed": [ + { + "attnum": 3, + "cltype": "character varying", + "attcompression": "lz4" + } + ] + } + }, + "store_object_id": true, + "expected_sql_file": "alter_table_change_col_type_comp.sql", + "expected_msql_file": "alter_table_change_col_type_comp_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table ", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Table with serial columns", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql", + "data": { + "name": "table_with_serial_cols", + "relowner": "", + "relacl": [], + "description": "round-trip SERIAL columns (issue #9896)", + "coll_inherits": "[]", + "hastoasttable": true, + "primary_key": [], + "partitions": [], + "partition_type": "range", + "is_partitioned": false, + "schema": "public", + "columns": [ + { + "name": "id_serial", + "cltype": "serial", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": null, + "attprecision": null, + "attidentity": "", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "id_bigserial", + "cltype": "bigserial", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": null, + "attprecision": null, + "attidentity": "", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "id_smallserial", + "cltype": "smallserial", + "attacl": [], + "is_primary_key": false, + "attnotnull": true, + "attlen": null, + "attprecision": null, + "attidentity": "", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "payload", + "cltype": "text", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + } + ], + "foreign_key": [], + "check_constraint": [], + "unique_constraint": [], + "exclude_constraint": [], + "partition_keys": [], + "seclabels": [], + "forcerlspolicy": false, + "like_default_value": false, + "like_constraints": false, + "like_indexes": false, + "like_storage": false, + "like_comments": false, + "like_identity": false, + "like_statistics": false + }, + "store_object_id": true, + "expected_sql_file": "create_table_with_serial_cols.sql", + "expected_msql_file": "create_table_with_serial_cols_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table with serial columns", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_serial_cols" + } } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table.sql deleted file mode 100644 index 2fc4a5516ac..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table.sql +++ /dev/null @@ -1,33 +0,0 @@ --- Table: public.table_with_custom_autovaccum_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[] COLLATE pg_catalog."default", - col2 timestamp without time zone -) -WITH ( - OIDS = FALSE, - toast.autovacuum_enabled = FALSE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 60, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 100, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table_msql.sql deleted file mode 100644 index f8cf5a96808..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/alter_table_with_toast_table_msql.sql +++ /dev/null @@ -1,14 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - autovacuum_analyze_threshold = 60, - autovacuum_vacuum_cost_limit = 100 -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" RESET ( - autovacuum_enabled -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - toast.autovacuum_enabled = false, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql deleted file mode 100644 index db799d0fbbd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Table: public.partition_table_with_collate_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - --- Partitions SQL - -CREATE TABLE IF NOT EXISTS public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_arr_small - OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql deleted file mode 100644 index ab5432a011d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_partition_table_with_collate_msql.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -); - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - -CREATE TABLE IF NOT EXISTS public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25'); - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition.sql deleted file mode 100644 index 3b1f62801af..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Table: public.table_with_hash_patition_$%{}[]()&*^!@\"'`\\/# - --- DROP TABLE IF EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" -( - id bigint, - name text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY HASH (id) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - IS 'hash partition'; - --- Partitions SQL - -CREATE TABLE IF NOT EXISTS public.cust_part11 PARTITION OF public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - FOR VALUES WITH (modulus 2, remainder 1) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_part11 - OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition_msql.sql deleted file mode 100644 index 33e8c8fd103..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/create_table_with_hash_partition_msql.sql +++ /dev/null @@ -1,18 +0,0 @@ -CREATE TABLE public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" -( - id bigint, - name text, - arr numeric -) PARTITION BY HASH (id) -WITH ( - OIDS = FALSE -); - -ALTER TABLE IF EXISTS public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - IS 'hash partition'; - -CREATE TABLE IF NOT EXISTS public.cust_part11 PARTITION OF public."table_with_hash_patition_$%{}[]()&*^!@\""'`\\/#" - FOR VALUES WITH (MODULUS 2, REMAINDER 1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/test.json deleted file mode 100644 index 7f14eb91cc1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/11_plus/test.json +++ /dev/null @@ -1,1987 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table without primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "boolean", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 20, - "attprecision": 10, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "timestamp with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_without_primary_key.sql", - "expected_msql_file": "create_table_without_primary_key_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data types", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "cltype": "bigint" - }, - { - "attnum": 2, - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "cltype": "character varying" - }, - { - "attnum": 6, - "attlen": null, - "cltype": "time without time zone" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_data_type.sql", - "expected_msql_file": "alter_table_change_col_data_type_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add pk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attnotnull": true, - "is_primary_key": true - } - ] - }, - "primary_key": { - "added": [ - { - "columns": [ - { - "column": "col1" - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_pk_not_null_constraint.sql", - "expected_msql_file": "alter_table_add_pk_not_null_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add null constraint, rename column", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "name": "col1_rename", - "is_primary_key": false - }, - { - "attnum": 4, - "attnotnull": true - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_null_constraint_rename_col.sql", - "expected_msql_file": "alter_table_add_null_constraint_rename_col_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table add pk", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "integer", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "json", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk.sql", - "expected_msql_file": "create_table_with_pk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "added": [ - { - "name": "col3_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": 5, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_cols.sql", - "expected_msql_file": "alter_table_add_cols_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "deleted": [ - { - "attoptions": [], - "attacl": [], - "seclabels": [], - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "atttypid": 114, - "attnum": 2, - "cltype": "json", - "collspcname": "", - "description": null, - "edit_types": [ - "json", - "jsonb" - ], - "is_primary_key": false, - "attstattarget": -1, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attndims": 0, - "atttypmod": -1, - "attstorage": "x", - "defval": null, - "typname": "json", - "displaytypname": "json", - "elemoid": 114, - "typnspname": "pg_catalog", - "defaultstorage": "x", - "indkey": "1", - "isdup": false, - "is_fk": false, - "is_sys_column": false, - "relname": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "is_view_only": false, - "is_pk": false, - "old_attidentity": "a" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_delete_cols.sql", - "expected_msql_file": "alter_table_delete_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table delete columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with pk & check constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "create table comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "name": "custom_pk", - "comment": "custom pk created", - "fillfactor": "11", - "condeferrable": true, - "condeferred": true, - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "time with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "character", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 12, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [ - { - "name": "chk_const", - "consrc": "col2 != null", - "convalidated": false, - "comment": "chk const comment" - } - ], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk_chk.sql", - "expected_msql_file": "create_table_with_pk_chk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add unique constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "unique_constraint": { - "added": [ - { - "name": "unique", - "fillfactor": "13", - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_unique_const.sql", - "expected_msql_file": "alter_table_add_unique_const_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete constraints", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "check_constraint": { - "deleted": [ - { - "name": "chk_const", - "consrc": "col2 <> NULL::bpchar", - "connoinherit": false, - "convalidated": false, - "relname": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "nspname": "public", - "comment": "chk const comment", - "conislocal": true - } - ] - }, - "unique_constraint": { - "deleted": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"\"'`\\\\/#" - } - ], - "name": "unique", - "comment": null, - "spcname": "pg_default", - "fillfactor": "13", - "condeferrable": false, - "condeferred": false, - "include": [], - "col_count": 1, - "conislocal": true - } - ] - } - }, - "expected_sql_file": "alter_table_delete_constraints.sql", - "expected_msql_file": "alter_table_delete_constraints_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with pk & chk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for FK reference", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "fk_reference_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "bigint" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table with fk constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [ - { - "name": "fk_test", - "comment": "fk comment", - "condeferrable": true, - "confmatchtype": true, - "columns": [ - { - "local_column": "col1", - "references": "", - "referenced": "id" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_fk.sql", - "expected_msql_file": "create_table_with_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add one more fk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "foreign_key": { - "added": [ - { - "name": "fk2", - "columns": [ - { - "local_column": "col2", - "references": "", - "referenced": "name" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_another_fk.sql", - "expected_msql_file": "alter_table_add_another_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add exclude constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "exclude_constraint": { - "added": [ - { - "name": "ex_constr", - "amname": "btree", - "columns": [ - { - "column": "col1", - "is_exp": false, - "order": false, - "nulls_order": false, - "operator": "=", - "is_sort_nulls_applicable": false - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_exclude_constraint.sql", - "expected_msql_file": "alter_table_add_exclude_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with custom auto-vacuum", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "custom auto vacuum", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "t", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "character varying[]", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "date", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - }, - { - "name": "autovacuum_analyze_threshold", - "value": 55 - }, - { - "name": "autovacuum_freeze_max_age", - "value": 20000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 25 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 10 - }, - { - "name": "autovacuum_vacuum_scale_factor", - "value": 0.3 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 60 - }, - { - "name": "autovacuum_freeze_min_age", - "value": 500000 - }, - { - "name": "autovacuum_freeze_table_age", - "value": 1300000 - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_custom_autovacuum.sql", - "expected_msql_file": "create_table_with_custom_autovacuum_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add toast table", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "autovacuum_enabled": "x", - "toast_autovacuum": true, - "toast_autovacuum_enabled": "f", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_threshold", - "value": 60 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 100 - } - ] - }, - "vacuum_toast": { - "changed": [ - { - "name": "autovacuum_freeze_max_age", - "value": 2000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 50 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 13 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 70 - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_with_toast_table.sql", - "expected_msql_file": "alter_table_with_toast_table_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with advanced options", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "relhasoids": true, - "description": "test comment", - "relpersistence": true, - "fillfactor": "50", - "parallel_workers": "", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "double precision", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "numrange", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": true, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "rlspolicy": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_advanced_options.sql", - "expected_msql_file": "create_table_with_advanced_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table update grants", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "rlspolicy": false, - "forcerlspolicy": false, - "relacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_update_grants.sql", - "expected_msql_file": "alter_table_update_grants_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "like_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table using like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test ", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": true, - "like_constraints": true, - "like_indexes": true, - "like_storage": true, - "like_comments": true, - "like_identity": true, - "like_statistics": true, - "like_relation": "public.like_tbl" - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_lik_tbl.sql", - "expected_msql_file": "create_table_with_lik_tbl_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with list partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_active", - "values_in": "'ACTIVE'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "list", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with list partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small PARTITION", - "values_from": "20", - "values_to": "25", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "arr" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_range_partition.sql", - "expected_msql_file": "create_table_with_range_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with range partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition with collate and opclass", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small", - "values_from": "'20'", - "values_to": "'25'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status", - "collationame": "\"C\"", - "op_class": "text_pattern_ops" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_partition_table_with_collate.sql", - "expected_msql_file": "create_partition_table_with_collate_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk.sql deleted file mode 100644 index 520943fd0bd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk.sql +++ /dev/null @@ -1,31 +0,0 @@ --- Table: public.table_with_fk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text COLLATE pg_catalog."default", - CONSTRAINT fk2 FOREIGN KEY (col2) - REFERENCES public.fk_reference_tbl (name) MATCH SIMPLE - ON UPDATE NO ACTION - ON DELETE NO ACTION - NOT VALID, - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk_msql.sql deleted file mode 100644 index f1cc9a21c5a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_another_fk_msql.sql +++ /dev/null @@ -1,6 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - ADD CONSTRAINT fk2 FOREIGN KEY (col2) - REFERENCES public.fk_reference_tbl (name) - ON UPDATE NO ACTION - ON DELETE NO ACTION - NOT VALID; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols.sql deleted file mode 100644 index c203a7b14af..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols.sql +++ /dev/null @@ -1,20 +0,0 @@ --- Table: public.simple_table_with_pk$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer NOT NULL, - "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, - "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10,5), - "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", - CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols_msql.sql deleted file mode 100644 index 43b57e4e65c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_cols_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10, 5); - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN "col4_$%{}[]()&*^!@\""'`\\/#" text; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint.sql deleted file mode 100644 index bde2430f6c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint.sql +++ /dev/null @@ -1,34 +0,0 @@ --- Table: public.table_with_fk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text COLLATE pg_catalog."default", - CONSTRAINT fk2 FOREIGN KEY (col2) - REFERENCES public.fk_reference_tbl (name) MATCH SIMPLE - ON UPDATE NO ACTION - ON DELETE NO ACTION - NOT VALID, - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE, - CONSTRAINT ex_constr EXCLUDE USING btree ( - col1 WITH =) - -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint_msql.sql deleted file mode 100644 index 87ec4602216..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_exclude_constraint_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - ADD CONSTRAINT ex_constr EXCLUDE USING btree ( - col1 WITH =); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col.sql deleted file mode 100644 index 6695974b3ec..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1_rename bigint NOT NULL, - col2 character varying COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default" NOT NULL, - col5 numeric(20,10), - col6 time(5) without time zone, - CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1_rename) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col_msql.sql deleted file mode 100644 index 6da62563044..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_null_constraint_rename_col_msql.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - RENAME col1 TO col1_rename; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col4 SET NOT NULL; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint.sql deleted file mode 100644 index e3247b6f3ea..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 bigint NOT NULL, - col2 character varying COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default", - col5 numeric(20,10), - col6 time(5) without time zone, - CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint_msql.sql deleted file mode 100644 index 265a86abd58..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_pk_not_null_constraint_msql.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col1 SET NOT NULL; -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - ADD PRIMARY KEY (col1); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const.sql deleted file mode 100644 index 4d241798454..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const.sql +++ /dev/null @@ -1,28 +0,0 @@ --- Table: public.table_with_pk_chk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone NOT NULL, - col2 character(12) COLLATE pg_catalog."default", - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED, - CONSTRAINT "unique" UNIQUE ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=13), - CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; - -COMMENT ON CONSTRAINT chk_const ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'chk const comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const_msql.sql deleted file mode 100644 index 8bc96855a9c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_unique_const_msql.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - ADD CONSTRAINT "unique" UNIQUE ("col1_$%{}[]()&*^!@\""'`\\/#") - WITH (FILLFACTOR=13); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type.sql deleted file mode 100644 index 7a5901f18b9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 bigint, - col2 character varying COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default", - col5 numeric(20,10), - col6 time(5) without time zone -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type_msql.sql deleted file mode 100644 index 290f242443f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_change_col_data_type_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col1 TYPE bigint; - -ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col2 TYPE character varying COLLATE pg_catalog."default"; - -ALTER TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - ALTER COLUMN col6 TYPE time(5) without time zone ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols.sql deleted file mode 100644 index 75c7303a4d7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Table: public.simple_table_with_pk$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer NOT NULL, - "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10,5), - "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", - CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols_msql.sql deleted file mode 100644 index 4f7f5c7693a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_cols_msql.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "col2_$%{}[]()&*^!@\""'`\\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints.sql deleted file mode 100644 index 64088340730..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.table_with_pk_chk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone NOT NULL, - col2 character(12) COLLATE pg_catalog."default", - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints_msql.sql deleted file mode 100644 index ad937b1547e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_delete_constraints_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" DROP CONSTRAINT IF EXISTS "unique"; -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" DROP CONSTRAINT IF EXISTS chk_const; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants.sql deleted file mode 100644 index 0664a984b45..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_advanced_options_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#"; - -CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" -( - col1 double precision, - col2 numrange -) - -WITH ( - FILLFACTOR = 50 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -REVOKE ALL ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" FROM PUBLIC; - -GRANT SELECT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT ALL ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" TO enterprisedb; - -COMMENT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants_msql.sql deleted file mode 100644 index ed686217a1d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_update_grants_msql.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - DISABLE ROW LEVEL SECURITY; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - NO FORCE ROW LEVEL SECURITY; - -GRANT SELECT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table.sql deleted file mode 100644 index 23e3c2c9a58..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table.sql +++ /dev/null @@ -1,33 +0,0 @@ --- Table: public.table_with_custom_autovaccum_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[] COLLATE pg_catalog."default", - col2 timestamp without time zone -) - -WITH ( - toast.autovacuum_enabled = FALSE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 60, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 100, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table_msql.sql deleted file mode 100644 index f8cf5a96808..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_with_toast_table_msql.sql +++ /dev/null @@ -1,14 +0,0 @@ -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - autovacuum_analyze_threshold = 60, - autovacuum_vacuum_cost_limit = 100 -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" RESET ( - autovacuum_enabled -); -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( - toast.autovacuum_enabled = false, - toast.autovacuum_freeze_max_age = 2000000, - toast.autovacuum_vacuum_cost_delay = 50, - toast.autovacuum_vacuum_cost_limit = 13, - toast.autovacuum_vacuum_threshold = 70 -); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate.sql deleted file mode 100644 index 126bdc267e6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Table: public.partition_table_with_collate_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - --- Partitions SQL - -CREATE TABLE IF NOT EXISTS public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_arr_small - OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate_msql.sql deleted file mode 100644 index 5177e8b5a21..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_partition_table_with_collate_msql.sql +++ /dev/null @@ -1,16 +0,0 @@ -CREATE TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); - -ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - -CREATE TABLE IF NOT EXISTS public.cust_arr_small PARTITION OF public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25'); - diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options.sql deleted file mode 100644 index b10776a390e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_advanced_options_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#"; - -CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" -( - col1 double precision, - col2 numrange -) - -WITH ( - FILLFACTOR = 50 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - ENABLE ROW LEVEL SECURITY; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - FORCE ROW LEVEL SECURITY; - -COMMENT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options_msql.sql deleted file mode 100644 index b60ddc4124d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_advanced_options_msql.sql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE UNLOGGED TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" -( - col1 double precision, - col2 numrange -) - -WITH ( - FILLFACTOR = 50 -); - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - ENABLE ROW LEVEL SECURITY; - -ALTER TABLE IF EXISTS public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - FORCE ROW LEVEL SECURITY; - -COMMENT ON TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum.sql deleted file mode 100644 index 561874417f2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum.sql +++ /dev/null @@ -1,29 +0,0 @@ --- Table: public.table_with_custom_autovaccum_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[] COLLATE pg_catalog."default", - col2 timestamp without time zone -) - -WITH ( - autovacuum_enabled = TRUE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 55, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 10, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000 -) -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum_msql.sql deleted file mode 100644 index fafbf377d88..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_custom_autovacuum_msql.sql +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" -( - col1 character varying(10)[], - col2 date -) - -WITH ( - autovacuum_enabled = TRUE, - autovacuum_analyze_scale_factor = 0.2, - autovacuum_analyze_threshold = 55, - autovacuum_freeze_max_age = 20000000, - autovacuum_vacuum_cost_delay = 25, - autovacuum_vacuum_cost_limit = 10, - autovacuum_vacuum_scale_factor = 0.3, - autovacuum_vacuum_threshold = 60, - autovacuum_freeze_min_age = 500000, - autovacuum_freeze_table_age = 1300000 -); - -ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" - IS 'custom auto vacuum'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk.sql deleted file mode 100644 index f1ed97b472f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_fk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text COLLATE pg_catalog."default", - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk_msql.sql deleted file mode 100644 index ad2f2364121..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_fk_msql.sql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 bigint, - col3 text, - CONSTRAINT fk_test FOREIGN KEY (col1) - REFERENCES public.fk_reference_tbl (id) MATCH FULL - ON UPDATE NO ACTION - ON DELETE NO ACTION - DEFERRABLE - NOT VALID -); - -ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'test comment'; - -COMMENT ON CONSTRAINT fk_test ON public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" - IS 'fk comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl.sql deleted file mode 100644 index 235540166b1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl.sql +++ /dev/null @@ -1,19 +0,0 @@ --- Table: public.table_like_tbl$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" -( - id integer NOT NULL, - name text COLLATE pg_catalog."default", - CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (id), - CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_name_key" UNIQUE (name) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" - IS 'test '; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl_msql.sql deleted file mode 100644 index e3bd6833a42..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_lik_tbl_msql.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" -( - LIKE public.like_tbl - INCLUDING DEFAULTS - INCLUDING CONSTRAINTS - INCLUDING INDEXES - INCLUDING STORAGE - INCLUDING COMMENTS - INCLUDING GENERATED - INCLUDING IDENTITY - INCLUDING STATISTICS - -); - -ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" - IS 'test '; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition.sql deleted file mode 100644 index f8350037a68..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition.sql +++ /dev/null @@ -1,25 +0,0 @@ --- Table: public.table_with_patition_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY LIST (status); - -ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - --- Partitions SQL - -CREATE TABLE IF NOT EXISTS public.cust_active PARTITION OF public."table_with_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES IN ('ACTIVE') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public.cust_active - OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition_msql.sql deleted file mode 100644 index a5843c6a3f5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_partition_msql.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY LIST (status); - -ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" - IS 'partition table'; - -CREATE TABLE IF NOT EXISTS public.cust_active PARTITION OF public."table_with_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES IN ('ACTIVE'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk.sql deleted file mode 100644 index 4fa40293897..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk.sql +++ /dev/null @@ -1,18 +0,0 @@ --- Table: public.simple_table_with_pk$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer NOT NULL, - "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, - CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk.sql deleted file mode 100644 index ca9ae87bbe2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Table: public.table_with_pk_chk_constraints$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone NOT NULL, - col2 character(12) COLLATE pg_catalog."default", - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED, - CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; - -COMMENT ON CONSTRAINT chk_const ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'chk const comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk_msql.sql deleted file mode 100644 index fe051f7d2e9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_chk_msql.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" time(5) with time zone, - col2 character(12), - CONSTRAINT custom_pk PRIMARY KEY ("col1_$%{}[]()&*^!@\""'`\\/#") - WITH (FILLFACTOR=11) - DEFERRABLE INITIALLY DEFERRED, - CONSTRAINT chk_const CHECK (col2 != null) -); - -ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'create table comment'; -COMMENT ON CONSTRAINT custom_pk ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'custom pk created'; - -COMMENT ON CONSTRAINT chk_const ON public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" - IS 'chk const comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_msql.sql deleted file mode 100644 index 519192240ce..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_pk_msql.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" -( - "col1_$%{}[]()&*^!@\""'`\\/#" integer, - "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, - PRIMARY KEY ("col1_$%{}[]()&*^!@\""'`\\/#") -); - -ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition.sql deleted file mode 100644 index b8fa14fb956..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition.sql +++ /dev/null @@ -1,22 +0,0 @@ --- Table: public.table_with_range_patition_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text COLLATE pg_catalog."default", - arr numeric -) PARTITION BY RANGE (arr); - -ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - --- Partitions SQL - -CREATE TABLE IF NOT EXISTS public."cust_arr_small PARTITION" PARTITION OF public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM ('20') TO ('25') -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."cust_arr_small PARTITION" - OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition_msql.sql deleted file mode 100644 index bdf65e5617c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_range_partition_msql.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" -( - id integer, - status text, - arr numeric -) PARTITION BY RANGE (arr); - -ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -CREATE TABLE IF NOT EXISTS public."cust_arr_small PARTITION" PARTITION OF public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" - FOR VALUES FROM (20) TO (25); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key.sql deleted file mode 100644 index d5e23497c70..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key.sql +++ /dev/null @@ -1,21 +0,0 @@ --- Table: public.simple_table_$%{}[]()&*^!@"'`\/# - --- DROP TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#"; - -CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 text COLLATE pg_catalog."default", - col3 boolean, - col4 character varying(30) COLLATE pg_catalog."default", - col5 numeric(20,10), - col6 timestamp(5) with time zone -) - -TABLESPACE pg_default; - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key_msql.sql deleted file mode 100644 index d4d2cb49e97..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_without_primary_key_msql.sql +++ /dev/null @@ -1,15 +0,0 @@ -CREATE TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" -( - col1 integer, - col2 text, - col3 boolean, - col4 character varying(30), - col5 numeric(20, 10), - col6 timestamp(5) with time zone -); - -ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/test.json deleted file mode 100644 index e401b1e1ac7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/test.json +++ /dev/null @@ -1,2162 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table without primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "boolean", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 20, - "attprecision": 10, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "timestamp with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_without_primary_key.sql", - "expected_msql_file": "create_table_without_primary_key_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data types", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "cltype": "bigint" - }, - { - "attnum": 2, - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "cltype": "character varying" - }, - { - "attnum": 6, - "attlen": null, - "cltype": "time without time zone" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_data_type.sql", - "expected_msql_file": "alter_table_change_col_data_type_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add pk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attnotnull": true, - "is_primary_key": true - } - ] - }, - "primary_key": { - "added": [ - { - "columns": [ - { - "column": "col1" - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_pk_not_null_constraint.sql", - "expected_msql_file": "alter_table_add_pk_not_null_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add null constraint, rename column", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "name": "col1_rename", - "is_primary_key": false - }, - { - "attnum": 4, - "attnotnull": true - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_null_constraint_rename_col.sql", - "expected_msql_file": "alter_table_add_null_constraint_rename_col_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table add pk", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "integer", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "json", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk.sql", - "expected_msql_file": "create_table_with_pk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "added": [ - { - "name": "col3_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": 5, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_cols.sql", - "expected_msql_file": "alter_table_add_cols_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "deleted": [ - { - "attoptions": [], - "attacl": [], - "seclabels": [], - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "atttypid": 114, - "attnum": 2, - "cltype": "json", - "collspcname": "", - "description": null, - "edit_types": [ - "json", - "jsonb" - ], - "is_primary_key": false, - "attstattarget": -1, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attndims": 0, - "atttypmod": -1, - "attstorage": "x", - "defval": null, - "typname": "json", - "displaytypname": "json", - "elemoid": 114, - "typnspname": "pg_catalog", - "defaultstorage": "x", - "indkey": "1", - "isdup": false, - "is_fk": false, - "is_sys_column": false, - "relname": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "is_view_only": false, - "is_pk": false, - "old_attidentity": "a" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_delete_cols.sql", - "expected_msql_file": "alter_table_delete_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table delete columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with pk & check constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "create table comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "name": "custom_pk", - "comment": "custom pk created", - "fillfactor": "11", - "condeferrable": true, - "condeferred": true, - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "time with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "character", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 12, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [ - { - "name": "chk_const", - "consrc": "col2 != null", - "convalidated": false, - "comment": "chk const comment" - } - ], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk_chk.sql", - "expected_msql_file": "create_table_with_pk_chk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add unique constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "unique_constraint": { - "added": [ - { - "name": "unique", - "fillfactor": "13", - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_unique_const.sql", - "expected_msql_file": "alter_table_add_unique_const_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete constraints", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "check_constraint": { - "deleted": [ - { - "name": "chk_const", - "consrc": "col2 <> NULL::bpchar", - "connoinherit": false, - "convalidated": false, - "relname": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "nspname": "public", - "comment": "chk const comment", - "conislocal": true - } - ] - }, - "unique_constraint": { - "deleted": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"\"'`\\\\/#" - } - ], - "name": "unique", - "comment": null, - "spcname": "pg_default", - "fillfactor": "13", - "condeferrable": false, - "condeferred": false, - "include": [], - "col_count": 1, - "conislocal": true - } - ] - } - }, - "expected_sql_file": "alter_table_delete_constraints.sql", - "expected_msql_file": "alter_table_delete_constraints_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with pk & chk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for FK reference", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "fk_reference_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "bigint" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table with fk constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [ - { - "name": "fk_test", - "comment": "fk comment", - "condeferrable": true, - "confmatchtype": true, - "columns": [ - { - "local_column": "col1", - "references": "", - "referenced": "id" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_fk.sql", - "expected_msql_file": "create_table_with_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add one more fk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "foreign_key": { - "added": [ - { - "name": "fk2", - "columns": [ - { - "local_column": "col2", - "references": "", - "referenced": "name" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_another_fk.sql", - "expected_msql_file": "alter_table_add_another_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add exclude constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "exclude_constraint": { - "added": [ - { - "name": "ex_constr", - "amname": "btree", - "columns": [ - { - "column": "col1", - "is_exp": false, - "order": false, - "nulls_order": false, - "operator": "=", - "is_sort_nulls_applicable": false - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_exclude_constraint.sql", - "expected_msql_file": "alter_table_add_exclude_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with custom auto-vacuum", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "custom auto vacuum", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "t", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "character varying[]", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "date", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - }, - { - "name": "autovacuum_analyze_threshold", - "value": 55 - }, - { - "name": "autovacuum_freeze_max_age", - "value": 20000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 25 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 10 - }, - { - "name": "autovacuum_vacuum_scale_factor", - "value": 0.3 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 60 - }, - { - "name": "autovacuum_freeze_min_age", - "value": 500000 - }, - { - "name": "autovacuum_freeze_table_age", - "value": 1300000 - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_custom_autovacuum.sql", - "expected_msql_file": "create_table_with_custom_autovacuum_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add toast table", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "autovacuum_enabled": "x", - "toast_autovacuum": true, - "toast_autovacuum_enabled": "f", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_threshold", - "value": 60 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 100 - } - ] - }, - "vacuum_toast": { - "changed": [ - { - "name": "autovacuum_freeze_max_age", - "value": 2000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 50 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 13 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 70 - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_with_toast_table.sql", - "expected_msql_file": "alter_table_with_toast_table_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with advanced options", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "relhasoids": true, - "description": "test comment", - "relpersistence": true, - "fillfactor": "50", - "parallel_workers": "", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "double precision", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "numrange", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": true, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "rlspolicy": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_advanced_options.sql", - "expected_msql_file": "create_table_with_advanced_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table update grants", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "rlspolicy": false, - "forcerlspolicy": false, - "relacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_update_grants.sql", - "expected_msql_file": "alter_table_update_grants_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "like_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table using like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test ", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": true, - "like_constraints": true, - "like_indexes": true, - "like_storage": true, - "like_comments": true, - "like_generated": true, - "like_identity": true, - "like_statistics": true, - "like_relation": "public.like_tbl" - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_lik_tbl.sql", - "expected_msql_file": "create_table_with_lik_tbl_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with list partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_active", - "values_in": "'ACTIVE'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "list", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with list partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small PARTITION", - "values_from": "20", - "values_to": "25", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "arr" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_range_partition.sql", - "expected_msql_file": "create_table_with_range_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with range partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with hash partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "hash partition", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_part11", - "values_modulus": "2", - "values_remainder": "1", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "hash", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "name", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "id" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_hash_partition.sql", - "expected_msql_file": "create_table_with_hash_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with hash partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition with collate and opclass", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small", - "values_from": "'20'", - "values_to": "'25'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status", - "collationame": "\"C\"", - "op_class": "text_pattern_ops" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_partition_table_with_collate.sql", - "expected_msql_file": "create_partition_table_with_collate_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_lik_tbl_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_lik_tbl_msql.sql deleted file mode 100644 index f4981881f0f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_lik_tbl_msql.sql +++ /dev/null @@ -1,20 +0,0 @@ -CREATE TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" -( - LIKE public.like_tbl - INCLUDING DEFAULTS - INCLUDING CONSTRAINTS - INCLUDING INDEXES - INCLUDING STORAGE - INCLUDING COMMENTS - INCLUDING COMPRESSION - INCLUDING GENERATED - INCLUDING IDENTITY - INCLUDING STATISTICS - -); - -ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" - OWNER to enterprisedb; - -COMMENT ON TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" - IS 'test '; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/test.json deleted file mode 100644 index 8185db9bbcb..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/test.json +++ /dev/null @@ -1,2298 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table without primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "boolean", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 20, - "attprecision": 10, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "timestamp with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_without_primary_key.sql", - "expected_msql_file": "create_table_without_primary_key_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data types", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "cltype": "bigint" - }, - { - "attnum": 2, - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "cltype": "character varying" - }, - { - "attnum": 6, - "attlen": null, - "cltype": "time without time zone" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_data_type.sql", - "expected_msql_file": "alter_table_change_col_data_type_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add pk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attnotnull": true, - "is_primary_key": true - } - ] - }, - "primary_key": { - "added": [ - { - "columns": [ - { - "column": "col1" - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_pk_not_null_constraint.sql", - "expected_msql_file": "alter_table_add_pk_not_null_constraint_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add null constraint, rename column", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "name": "col1_rename", - "is_primary_key": false - }, - { - "attnum": 4, - "attnotnull": true - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_null_constraint_rename_col.sql", - "expected_msql_file": "alter_table_add_null_constraint_rename_col_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table add pk", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with primary key", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "integer", - "attacl": [], - "is_primary_key": true, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "json", - "attacl": [], - "is_primary_key": false, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk.sql", - "expected_msql_file": "create_table_with_pk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "added": [ - { - "name": "col3_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": 5, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col4_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_add_cols.sql", - "expected_msql_file": "alter_table_add_cols_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete columns", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "columns": { - "deleted": [ - { - "attoptions": [], - "attacl": [], - "seclabels": [], - "name": "col2_$%{}[]()&*^!@\\\"'`\\\\/#", - "atttypid": 114, - "attnum": 2, - "cltype": "json", - "collspcname": "", - "description": null, - "edit_types": [ - "json", - "jsonb" - ], - "is_primary_key": false, - "attstattarget": -1, - "attnotnull": true, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attndims": 0, - "atttypmod": -1, - "attstorage": "x", - "defval": null, - "typname": "json", - "displaytypname": "json", - "elemoid": 114, - "typnspname": "pg_catalog", - "defaultstorage": "x", - "indkey": "1", - "isdup": false, - "is_fk": false, - "is_sys_column": false, - "relname": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#", - "is_view_only": false, - "is_pk": false, - "old_attidentity": "a" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_delete_cols.sql", - "expected_msql_file": "alter_table_delete_cols_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table delete columns", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_with_pk$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with pk & check constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "create table comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [ - { - "name": "custom_pk", - "comment": "custom pk created", - "fillfactor": "11", - "condeferrable": true, - "condeferred": true, - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1_$%{}[]()&*^!@\\\"'`\\\\/#", - "cltype": "time with time zone", - "attacl": [], - "min_val_attlen": 0, - "max_val_attlen": 6, - "is_primary_key": false, - "attnotnull": false, - "attlen": 5, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "character", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 12, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [ - { - "name": "chk_const", - "consrc": "col2 != null", - "convalidated": false, - "comment": "chk const comment" - } - ], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_pk_chk.sql", - "expected_msql_file": "create_table_with_pk_chk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add unique constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "unique_constraint": { - "added": [ - { - "name": "unique", - "fillfactor": "13", - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"'`\\\\/#" - } - ], - "include": [] - } - ] - } - }, - "expected_sql_file": "alter_table_add_unique_const.sql", - "expected_msql_file": "alter_table_add_unique_const_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table delete constraints", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "check_constraint": { - "deleted": [ - { - "name": "chk_const", - "consrc": "col2 <> NULL::bpchar", - "connoinherit": false, - "convalidated": false, - "relname": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#", - "nspname": "public", - "comment": "chk const comment", - "conislocal": true - } - ] - }, - "unique_constraint": { - "deleted": [ - { - "columns": [ - { - "column": "col1_$%{}[]()&*^!@\\\"\"'`\\\\/#" - } - ], - "name": "unique", - "comment": null, - "spcname": "pg_default", - "fillfactor": "13", - "condeferrable": false, - "condeferred": false, - "include": [], - "col_count": 1, - "conislocal": true - } - ] - } - }, - "expected_sql_file": "alter_table_delete_constraints.sql", - "expected_msql_file": "alter_table_delete_constraints_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with pk & chk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_pk_chk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for FK reference", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "fk_reference_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "bigint" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table with fk constraint", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col3", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [ - { - "name": "fk_test", - "comment": "fk comment", - "condeferrable": true, - "confmatchtype": true, - "columns": [ - { - "local_column": "col1", - "references": "", - "referenced": "id" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_fk.sql", - "expected_msql_file": "create_table_with_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add one more fk", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "foreign_key": { - "added": [ - { - "name": "fk2", - "columns": [ - { - "local_column": "col2", - "references": "", - "referenced": "name" - } - ], - "confupdtype": "a", - "confdeltype": "a", - "autoindex": false, - "coveringindex": null - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_another_fk.sql", - "expected_msql_file": "alter_table_add_another_fk_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add exclude constraint", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#", - "exclude_constraint": { - "added": [ - { - "name": "ex_constr", - "amname": "btree", - "columns": [ - { - "column": "col1", - "is_exp": false, - "order": false, - "nulls_order": false, - "operator": "=", - "is_sort_nulls_applicable": false - } - ], - "include": [] - } - ] - } - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "alter_table_add_exclude_constraint.sql", - "expected_msql_file": "alter_table_add_exclude_constraint_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_fk_constraints$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with custom auto-vacuum", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "custom auto vacuum", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "t", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "character varying[]", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 10, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "date", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - }, - { - "name": "autovacuum_analyze_threshold", - "value": 55 - }, - { - "name": "autovacuum_freeze_max_age", - "value": 20000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 25 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 10 - }, - { - "name": "autovacuum_vacuum_scale_factor", - "value": 0.3 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 60 - }, - { - "name": "autovacuum_freeze_min_age", - "value": 500000 - }, - { - "name": "autovacuum_freeze_table_age", - "value": 1300000 - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_custom_autovacuum.sql", - "expected_msql_file": "create_table_with_custom_autovacuum_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table add toast table", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#", - "autovacuum_enabled": "x", - "toast_autovacuum": true, - "toast_autovacuum_enabled": "f", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_threshold", - "value": 60 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 100 - } - ] - }, - "vacuum_toast": { - "changed": [ - { - "name": "autovacuum_freeze_max_age", - "value": 2000000 - }, - { - "name": "autovacuum_vacuum_cost_delay", - "value": 50 - }, - { - "name": "autovacuum_vacuum_cost_limit", - "value": 13 - }, - { - "name": "autovacuum_vacuum_threshold", - "value": 70 - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_with_toast_table.sql", - "expected_msql_file": "alter_table_with_toast_table_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with fk constraints", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_custom_autovaccum_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with advanced options", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "relhasoids": true, - "description": "test comment", - "relpersistence": true, - "fillfactor": "50", - "parallel_workers": "", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col1", - "cltype": "double precision", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col2", - "cltype": "numrange", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": true, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "rlspolicy": true - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_advanced_options.sql", - "expected_msql_file": "create_table_with_advanced_options_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table update grants", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#", - "rlspolicy": false, - "forcerlspolicy": false, - "relacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_update_grants.sql", - "expected_msql_file": "alter_table_update_grants_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_advanced_options_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table for like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "like_tbl", - "columns": [ - { - "name": "id", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "name", - "cltype": "text" - } - ], - "primary_key": [ - { - "columns": [ - { - "column": "id" - } - ], - "include": [] - } - ], - "unique_constraint": [ - { - "name": "", - "columns": [ - { - "column": "name" - } - ], - "include": [] - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Table using like table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test ", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "partition_type": "range", - "is_partitioned": false, - "schema": "public", - "columns": [], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": true, - "like_constraints": true, - "like_indexes": true, - "like_storage": true, - "like_comments": true, - "like_generated": true, - "like_identity": true, - "like_statistics": true, - "like_compression": true, - "like_relation": "public.like_tbl" - }, - "store_object_id": true, - "preprocess_data": true, - "expected_sql_file": "create_table_with_lik_tbl.sql", - "expected_msql_file": "create_table_with_lik_tbl_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with advanced options", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_like_tbl$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with list partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_active", - "values_in": "'ACTIVE'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "list", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_partition.sql", - "expected_msql_file": "create_table_with_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with list partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small PARTITION", - "values_from": "20", - "values_to": "25", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "arr" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_range_partition.sql", - "expected_msql_file": "create_table_with_range_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with range partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with hash partition", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "hash partition", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_part11", - "values_modulus": "2", - "values_remainder": "1", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "hash", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "name", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "id" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_hash_partition.sql", - "expected_msql_file": "create_table_with_hash_partition_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table with hash partition", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" - } - }, - { - "type": "create", - "name": "Create Table with range partition with collate and opclass", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "partition table", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [ - { - "is_attach": false, - "partition_name": "cust_arr_small", - "values_from": "'20'", - "values_to": "'25'", - "is_sub_partitioned": false, - "sub_partition_type": "range", - "sub_partition_keys": [] - } - ], - "partition_type": "range", - "is_partitioned": true, - "schema": "public", - "columns": [ - { - "name": "id", - "cltype": "integer", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "status", - "cltype": "text", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "arr", - "cltype": "numeric", - "attacl": [], - "min_val_attlen": 1, - "min_val_attprecision": 0, - "max_val_attlen": 1000, - "max_val_attprecision": 1000, - "is_primary_key": false, - "attnotnull": false, - "attlen": null, - "attprecision": null, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [ - { - "key_type": "column", - "pt_column": "status", - "collationame": "\"C\"", - "op_class": "text_pattern_ops" - } - ], - "vacuum_table": [ - { - "name": "autovacuum_analyze_scale_factor" - }, - { - "name": "autovacuum_analyze_threshold" - }, - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "vacuum_toast": [ - { - "name": "autovacuum_freeze_max_age" - }, - { - "name": "autovacuum_vacuum_cost_delay" - }, - { - "name": "autovacuum_vacuum_cost_limit" - }, - { - "name": "autovacuum_vacuum_scale_factor" - }, - { - "name": "autovacuum_vacuum_threshold" - }, - { - "name": "autovacuum_freeze_min_age" - }, - { - "name": "autovacuum_freeze_table_age" - } - ], - "seclabels": [], - "forcerlspolicy": false, - "like_default_value": false, - "like_constraints": false, - "like_indexes": false, - "like_storage": false, - "like_comments": false, - "like_identity": false, - "like_statistics": false, - "like_generated": false, - "like_compression": false, - "autovacuum_custom": false - }, - "store_object_id": true, - "expected_sql_file": "create_partition_table_with_collate.sql", - "expected_msql_file": "create_partition_table_with_collate_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" - } - }, - { - "type": "create", - "name": "Create Table with compression columns", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", - "relowner": "enterprisedb", - "relacl": [], - "description": "test comment", - "coll_inherits": "[]", - "hastoasttable": true, - "toast_autovacuum_enabled": "x", - "autovacuum_enabled": "x", - "primary_key": [], - "partitions": [], - "is_partitioned": false, - "schema": "public", - "columns": [ - { - "name": "col4", - "cltype": "character varying", - "attacl": [], - "min_val_attlen": 1, - "max_val_attlen": 2147483647, - "is_primary_key": false, - "attnotnull": false, - "attlen": 30, - "attprecision": null, - "attidentity": "a", - "attcompression": "pglz", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col5", - "cltype": "bit", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attidentity": "a", - "attcompression": "lz4", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - }, - { - "name": "col6", - "cltype": "bigint", - "attacl": [], - "is_primary_key": false, - "attnotnull": false, - "attidentity": "a", - "colconstype": "n", - "attoptions": [], - "seclabels": [] - } - ], - "foreign_key": [], - "check_constraint": [], - "unique_constraint": [], - "exclude_constraint": [], - "partition_keys": [] - }, - "store_object_id": true, - "expected_sql_file": "create_table_with_column_compression.sql", - "expected_msql_file": "create_table_with_column_compression_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column compression type", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 1, - "attcompression": "lz4" - }, - { - "attnum": 2, - "attcompression": "pglz" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_comp.sql", - "expected_msql_file": "alter_table_change_col_comp_msql.sql" - }, - { - "type": "alter", - "name": "Alter Table to change column data type and compression type", - "endpoint": "NODE-table.obj_id", - "sql_endpoint": "NODE-table.sql_id", - "msql_endpoint": "NODE-table.msql_id", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", - "columns": { - "changed": [ - { - "attnum": 3, - "cltype": "character varying", - "attcompression": "lz4" - } - ] - } - }, - "store_object_id": true, - "expected_sql_file": "alter_table_change_col_type_comp.sql", - "expected_msql_file": "alter_table_change_col_type_comp_msql.sql" - }, - { - "type": "delete", - "name": "Delete Table ", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_another_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_another_fk.sql index 78128ae9375..520943fd0bd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_another_fk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_another_fk.sql @@ -18,9 +18,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/# ON DELETE NO ACTION DEFERRABLE ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols.sql index ab001276d36..c203a7b14af 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols.sql @@ -10,9 +10,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols_msql.sql index 38b9590f20d..43b57e4e65c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_cols_msql.sql @@ -1,5 +1,5 @@ ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10, 5); + ADD COLUMN "col3_$%{}[]()&*^!@\""'`\\/#" numeric(10, 5); ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" - ADD COLUMN IF NOT EXISTS "col4_$%{}[]()&*^!@\""'`\\/#" text; + ADD COLUMN "col4_$%{}[]()&*^!@\""'`\\/#" text; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_exclude_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_exclude_constraint.sql index 3a37ee35894..bde2430f6c9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_exclude_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_exclude_constraint.sql @@ -21,9 +21,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/# col1 WITH =) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_null_constraint_rename_col.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_null_constraint_rename_col.sql index e9e418ef024..6695974b3ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_null_constraint_rename_col.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_null_constraint_rename_col.sql @@ -12,9 +12,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col6 time(5) without time zone, CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1_rename) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_partition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/alter_table_add_partition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_partition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_pk_not_null_constraint.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_pk_not_null_constraint.sql index bc628795a95..e3247b6f3ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_pk_not_null_constraint.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_pk_not_null_constraint.sql @@ -12,9 +12,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col6 time(5) without time zone, CONSTRAINT "simple_table_$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (col1) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_unique_const.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_unique_const.sql index 58333a2e884..4d241798454 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_unique_const.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_add_unique_const.sql @@ -13,9 +13,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""' WITH (FILLFACTOR=13), CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_comp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_comp.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_comp.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_comp.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_comp_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_comp_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_comp_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_comp_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_data_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_data_type.sql index 021cb3c61c8..7a5901f18b9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_data_type.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_data_type.sql @@ -11,9 +11,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col5 numeric(20,10), col6 time(5) without time zone ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_type_comp.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_type_comp.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_type_comp.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_type_comp.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_type_comp_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_type_comp_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/alter_table_change_col_type_comp_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_change_col_type_comp_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_cols.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_cols.sql index b0154ffea0b..75c7303a4d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_cols.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_cols.sql @@ -9,9 +9,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col4_$%{}[]()&*^!@\""'`\\/#" text COLLATE pg_catalog."default", CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_constraints.sql index 5bf52ff92a0..64088340730 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_constraints.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_delete_constraints.sql @@ -10,9 +10,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""' WITH (FILLFACTOR=11) DEFERRABLE INITIALLY DEFERRED ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_update_grants.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_update_grants.sql index 072cc2df426..0664a984b45 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_update_grants.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_update_grants.sql @@ -7,8 +7,8 @@ CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]() col1 double precision, col2 numrange ) + WITH ( - OIDS = TRUE, FILLFACTOR = 50 ) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table.sql index 2fc4a5516ac..23e3c2c9a58 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table.sql @@ -7,8 +7,8 @@ CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""' col1 character varying(10)[] COLLATE pg_catalog."default", col2 timestamp without time zone ) + WITH ( - OIDS = FALSE, toast.autovacuum_enabled = FALSE, autovacuum_analyze_scale_factor = 0.2, autovacuum_analyze_threshold = 60, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table_msql.sql index 89a93acebe0..f8cf5a96808 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/alter_table_with_toast_table_msql.sql @@ -5,7 +5,6 @@ ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" RESET ( autovacuum_enabled ); - ALTER TABLE IF EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" SET ( toast.autovacuum_enabled = false, toast.autovacuum_freeze_max_age = 2000000, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate.sql index db799d0fbbd..126bdc267e6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate.sql @@ -7,11 +7,7 @@ CREATE TABLE IF NOT EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""' id integer, status text COLLATE pg_catalog."default", arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate_msql.sql index ab5432a011d..5177e8b5a21 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_partition_table_with_collate_msql.sql @@ -3,10 +3,7 @@ CREATE TABLE public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" id integer, status text, arr numeric -) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops) -WITH ( - OIDS = FALSE -); +) PARTITION BY RANGE (status COLLATE "C" text_pattern_ops); ALTER TABLE IF EXISTS public."partition_table_with_collate_$%{}[]()&*^!@""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options.sql index 92d1688f390..b10776a390e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options.sql @@ -7,8 +7,8 @@ CREATE UNLOGGED TABLE IF NOT EXISTS public."table_with_advanced_options_$%{}[]() col1 double precision, col2 numrange ) + WITH ( - OIDS = TRUE, FILLFACTOR = 50 ) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options_msql.sql index 17cbb1431ba..b60ddc4124d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_advanced_options_msql.sql @@ -3,8 +3,8 @@ CREATE UNLOGGED TABLE public."table_with_advanced_options_$%{}[]()&*^!@""'`\/#" col1 double precision, col2 numrange ) + WITH ( - OIDS = TRUE, FILLFACTOR = 50 ); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_column_compression.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_column_compression.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_column_compression.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_column_compression.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_column_compression_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_column_compression_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/14_plus/create_table_with_column_compression_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_column_compression_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum.sql index e8289d8af24..561874417f2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum.sql @@ -7,8 +7,8 @@ CREATE TABLE IF NOT EXISTS public."table_with_custom_autovaccum_$%{}[]()&*^!@""' col1 character varying(10)[] COLLATE pg_catalog."default", col2 timestamp without time zone ) + WITH ( - OIDS = FALSE, autovacuum_enabled = TRUE, autovacuum_analyze_scale_factor = 0.2, autovacuum_analyze_threshold = 55, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum_msql.sql index 59e3d84b338..fafbf377d88 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_custom_autovacuum_msql.sql @@ -3,8 +3,8 @@ CREATE TABLE public."table_with_custom_autovaccum_$%{}[]()&*^!@""'`\/#" col1 character varying(10)[], col2 date ) + WITH ( - OIDS = FALSE, autovacuum_enabled = TRUE, autovacuum_analyze_scale_factor = 0.2, autovacuum_analyze_threshold = 55, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk.sql index f7872b94460..f1ed97b472f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk.sql @@ -13,9 +13,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/# ON DELETE NO ACTION DEFERRABLE ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk_msql.sql index cb2714ccd09..ad2f2364121 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_fk_msql.sql @@ -9,9 +9,6 @@ CREATE TABLE public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" ON DELETE NO ACTION DEFERRABLE NOT VALID -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."table_with_fk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_hash_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_hash_partition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_hash_partition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_hash_partition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_hash_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_hash_partition_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/12_plus/create_table_with_hash_partition_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_hash_partition_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl.sql index d62b3f1e3fc..235540166b1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl.sql @@ -9,9 +9,7 @@ CREATE TABLE IF NOT EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY (id), CONSTRAINT "table_like_tbl$%{}[]()&*^!@""'`\/#_name_key" UNIQUE (name) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl_msql.sql index 9b1fb27eee8..f4981881f0f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_lik_tbl_msql.sql @@ -6,12 +6,11 @@ CREATE TABLE public."table_like_tbl$%{}[]()&*^!@""'`\/#" INCLUDING INDEXES INCLUDING STORAGE INCLUDING COMMENTS + INCLUDING COMPRESSION + INCLUDING GENERATED INCLUDING IDENTITY INCLUDING STATISTICS -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."table_like_tbl$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition.sql index c78bdccefa4..f8350037a68 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition.sql @@ -7,11 +7,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" id integer, status text COLLATE pg_catalog."default", arr numeric -) PARTITION BY LIST (status) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY LIST (status); ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition_msql.sql index 5c987202be7..a5843c6a3f5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_partition_msql.sql @@ -3,10 +3,7 @@ CREATE TABLE public."table_with_patition_$%{}[]()&*^!@""'`\/#" id integer, status text, arr numeric -) PARTITION BY LIST (status) -WITH ( - OIDS = FALSE -); +) PARTITION BY LIST (status); ALTER TABLE IF EXISTS public."table_with_patition_$%{}[]()&*^!@""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk.sql index 163a5bd0c11..4fa40293897 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk.sql @@ -8,9 +8,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, CONSTRAINT "simple_table_with_pk$%{}[]()&*^!@""'`\/#_pkey" PRIMARY KEY ("col1_$%{}[]()&*^!@\""""'`\\/#") ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk.sql index b011c933efd..ca9ae87bbe2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk.sql @@ -11,9 +11,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""' DEFERRABLE INITIALLY DEFERRED, CONSTRAINT chk_const CHECK (col2 <> NULL::bpchar) ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk_msql.sql index 9303172ea59..fe051f7d2e9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_chk_msql.sql @@ -6,9 +6,6 @@ CREATE TABLE public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" WITH (FILLFACTOR=11) DEFERRABLE INITIALLY DEFERRED, CONSTRAINT chk_const CHECK (col2 != null) -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."table_with_pk_chk_constraints$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_msql.sql index 39d8581cd09..519192240ce 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_pk_msql.sql @@ -3,9 +3,6 @@ CREATE TABLE public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" "col1_$%{}[]()&*^!@\""'`\\/#" integer, "col2_$%{}[]()&*^!@\""'`\\/#" json NOT NULL, PRIMARY KEY ("col1_$%{}[]()&*^!@\""'`\\/#") -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."simple_table_with_pk$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition.sql index 36bfb537d00..b8fa14fb956 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition.sql @@ -7,11 +7,7 @@ CREATE TABLE IF NOT EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/ id integer, status text COLLATE pg_catalog."default", arr numeric -) PARTITION BY RANGE (arr) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; +) PARTITION BY RANGE (arr); ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition_msql.sql index 015bb192dc5..bdf65e5617c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_with_range_partition_msql.sql @@ -3,10 +3,7 @@ CREATE TABLE public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" id integer, status text, arr numeric -) PARTITION BY RANGE (arr) -WITH ( - OIDS = FALSE -); +) PARTITION BY RANGE (arr); ALTER TABLE IF EXISTS public."table_with_range_patition_$%{}[]()&*^!@""'`\/#" OWNER to enterprisedb; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key.sql index 6a163d356d7..d5e23497c70 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key.sql @@ -11,9 +11,7 @@ CREATE TABLE IF NOT EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" col5 numeric(20,10), col6 timestamp(5) with time zone ) -WITH ( - OIDS = FALSE -) + TABLESPACE pg_default; ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key_msql.sql index d763298c942..d4d2cb49e97 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/create_table_without_primary_key_msql.sql @@ -6,9 +6,6 @@ CREATE TABLE public."simple_table_$%{}[]()&*^!@""'`\/#" col4 character varying(30), col5 numeric(20, 10), col6 timestamp(5) with time zone -) -WITH ( - OIDS = FALSE ); ALTER TABLE IF EXISTS public."simple_table_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/test.json index 92f2835e40c..8185db9bbcb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/ppas/default/test.json @@ -171,7 +171,11 @@ "like_constraints": false, "like_indexes": false, "like_storage": false, - "like_comments": false + "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "expected_sql_file": "create_table_without_primary_key.sql", @@ -397,7 +401,11 @@ "like_constraints": false, "like_indexes": false, "like_storage": false, - "like_comments": false + "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "expected_sql_file": "create_table_with_pk.sql", @@ -650,7 +658,11 @@ "like_constraints": false, "like_indexes": false, "like_storage": false, - "like_comments": false + "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "expected_sql_file": "create_table_with_pk_chk.sql", @@ -923,7 +935,11 @@ "like_constraints": false, "like_indexes": false, "like_storage": false, - "like_comments": false + "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false }, "store_object_id": true, "preprocess_data": true, @@ -1126,6 +1142,10 @@ "like_indexes": false, "like_storage": false, "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": true }, "store_object_id": true, @@ -1304,6 +1324,10 @@ "like_indexes": false, "like_storage": false, "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false, "rlspolicy": true }, "store_object_id": true, @@ -1478,8 +1502,10 @@ "like_indexes": true, "like_storage": true, "like_comments": true, + "like_generated": true, "like_identity": true, "like_statistics": true, + "like_compression": true, "like_relation": "public.like_tbl" }, "store_object_id": true, @@ -1638,12 +1664,24 @@ "like_indexes": false, "like_storage": false, "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": false }, "store_object_id": true, "expected_sql_file": "create_table_with_partition.sql", "expected_msql_file": "create_table_with_partition_msql.sql" }, + { + "type": "delete", + "name": "Delete Table with list partition", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_patition_$%{}[]()&*^!@\"'`\\/#" + } + }, { "type": "create", "name": "Create Table with range partition", @@ -1787,12 +1825,186 @@ "like_indexes": false, "like_storage": false, "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": false }, "store_object_id": true, "expected_sql_file": "create_table_with_range_partition.sql", "expected_msql_file": "create_table_with_range_partition_msql.sql" }, + { + "type": "delete", + "name": "Delete Table with range partition", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_range_patition_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Table with hash partition", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql", + "data": { + "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#", + "relowner": "enterprisedb", + "relacl": [], + "description": "hash partition", + "coll_inherits": "[]", + "hastoasttable": true, + "toast_autovacuum_enabled": "x", + "autovacuum_enabled": "x", + "primary_key": [], + "partitions": [ + { + "is_attach": false, + "partition_name": "cust_part11", + "values_modulus": "2", + "values_remainder": "1", + "is_sub_partitioned": false, + "sub_partition_type": "range", + "sub_partition_keys": [] + } + ], + "partition_type": "hash", + "is_partitioned": true, + "schema": "public", + "columns": [ + { + "name": "id", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "name", + "cltype": "text", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "arr", + "cltype": "numeric", + "attacl": [], + "min_val_attlen": 1, + "min_val_attprecision": 0, + "max_val_attlen": 1000, + "max_val_attprecision": 1000, + "is_primary_key": false, + "attnotnull": false, + "attlen": null, + "attprecision": null, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + } + ], + "foreign_key": [], + "check_constraint": [], + "unique_constraint": [], + "exclude_constraint": [], + "partition_keys": [ + { + "key_type": "column", + "pt_column": "id" + } + ], + "vacuum_table": [ + { + "name": "autovacuum_analyze_scale_factor" + }, + { + "name": "autovacuum_analyze_threshold" + }, + { + "name": "autovacuum_freeze_max_age" + }, + { + "name": "autovacuum_vacuum_cost_delay" + }, + { + "name": "autovacuum_vacuum_cost_limit" + }, + { + "name": "autovacuum_vacuum_scale_factor" + }, + { + "name": "autovacuum_vacuum_threshold" + }, + { + "name": "autovacuum_freeze_min_age" + }, + { + "name": "autovacuum_freeze_table_age" + } + ], + "vacuum_toast": [ + { + "name": "autovacuum_freeze_max_age" + }, + { + "name": "autovacuum_vacuum_cost_delay" + }, + { + "name": "autovacuum_vacuum_cost_limit" + }, + { + "name": "autovacuum_vacuum_scale_factor" + }, + { + "name": "autovacuum_vacuum_threshold" + }, + { + "name": "autovacuum_freeze_min_age" + }, + { + "name": "autovacuum_freeze_table_age" + } + ], + "seclabels": [], + "forcerlspolicy": false, + "like_default_value": false, + "like_constraints": false, + "like_indexes": false, + "like_storage": false, + "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false, + "autovacuum_custom": false + }, + "store_object_id": true, + "expected_sql_file": "create_table_with_hash_partition.sql", + "expected_msql_file": "create_table_with_hash_partition_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table with hash partition", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "table_with_hash_patition_$%{}[]()&*^!@\\\"'`\\\\/#" + } + }, { "type": "create", "name": "Create Table with range partition with collate and opclass", @@ -1939,11 +2151,148 @@ "like_indexes": false, "like_storage": false, "like_comments": false, + "like_identity": false, + "like_statistics": false, + "like_generated": false, + "like_compression": false, "autovacuum_custom": false }, "store_object_id": true, "expected_sql_file": "create_partition_table_with_collate.sql", "expected_msql_file": "create_partition_table_with_collate_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table ", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "partition_table_with_collate_$%{}[]()&*^!@\"'`\\/#" + } + }, + { + "type": "create", + "name": "Create Table with compression columns", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", + "relowner": "enterprisedb", + "relacl": [], + "description": "test comment", + "coll_inherits": "[]", + "hastoasttable": true, + "toast_autovacuum_enabled": "x", + "autovacuum_enabled": "x", + "primary_key": [], + "partitions": [], + "is_partitioned": false, + "schema": "public", + "columns": [ + { + "name": "col4", + "cltype": "character varying", + "attacl": [], + "min_val_attlen": 1, + "max_val_attlen": 2147483647, + "is_primary_key": false, + "attnotnull": false, + "attlen": 30, + "attprecision": null, + "attidentity": "a", + "attcompression": "pglz", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "col5", + "cltype": "bit", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attidentity": "a", + "attcompression": "lz4", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + }, + { + "name": "col6", + "cltype": "bigint", + "attacl": [], + "is_primary_key": false, + "attnotnull": false, + "attidentity": "a", + "colconstype": "n", + "attoptions": [], + "seclabels": [] + } + ], + "foreign_key": [], + "check_constraint": [], + "unique_constraint": [], + "exclude_constraint": [], + "partition_keys": [] + }, + "store_object_id": true, + "expected_sql_file": "create_table_with_column_compression.sql", + "expected_msql_file": "create_table_with_column_compression_msql.sql" + }, + { + "type": "alter", + "name": "Alter Table to change column compression type", + "endpoint": "NODE-table.obj_id", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql_id", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", + "columns": { + "changed": [ + { + "attnum": 1, + "attcompression": "lz4" + }, + { + "attnum": 2, + "attcompression": "pglz" + } + ] + } + }, + "store_object_id": true, + "expected_sql_file": "alter_table_change_col_comp.sql", + "expected_msql_file": "alter_table_change_col_comp_msql.sql" + }, + { + "type": "alter", + "name": "Alter Table to change column data type and compression type", + "endpoint": "NODE-table.obj_id", + "sql_endpoint": "NODE-table.sql_id", + "msql_endpoint": "NODE-table.msql_id", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#", + "columns": { + "changed": [ + { + "attnum": 3, + "cltype": "character varying", + "attcompression": "lz4" + } + ] + } + }, + "store_object_id": true, + "expected_sql_file": "alter_table_change_col_type_comp.sql", + "expected_msql_file": "alter_table_change_col_type_comp_msql.sql" + }, + { + "type": "delete", + "name": "Delete Table ", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "simple_table_comp_$%{}[]()&*^!@\"'`\\/#" + } } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index ece31b34cff..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql deleted file mode 100644 index c0f12660911..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index c42f6d02ecf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql deleted file mode 100644 index accfda7493a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always.sql deleted file mode 100644 index d5b9767e9d1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE CONSTRAINT TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" - AFTER UPDATE OF col2 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'comment for update event trigger'; - -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always_msql.sql deleted file mode 100644 index 0fd72512301..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_after_update_event_trigger_enable_always_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger.sql deleted file mode 100644 index b96080089c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger_msql.sql deleted file mode 100644 index 6d135187951..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_insert_event_trigger_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_update_event_trigger_enable_replica.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_update_event_trigger_enable_replica.sql deleted file mode 100644 index 1aae2013e13..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_update_event_trigger_enable_replica.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE REPLICA TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index 92b3b09721d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition_msql.sql deleted file mode 100644 index da0f1bed351..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index d7d068ee0a4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition_msql.sql deleted file mode 100644 index c99b2dbf7aa..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_insert_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger.sql deleted file mode 100644 index d2894d824f6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE CONSTRAINT TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" - AFTER UPDATE OF col2 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'comment for update event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger_msql.sql deleted file mode 100644 index 6b45691cce8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_update_event_trigger_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE CONSTRAINT TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" - AFTER UPDATE OF col2 - ON public.tablefortrigger - FOR EACH ROW - WHEN (OLD.col2 IS DISTINCT FROM NEW.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'comment for update event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger.sql deleted file mode 100644 index bf0d6bf5fcd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_b4r_update_mul_events_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT OR UPDATE OF col3 - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'multiple event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger_msql.sql deleted file mode 100644 index db938f9c135..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_b4r_update_multiple_event_trigger_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT OR UPDATE OF col3 - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'multiple event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement.sql deleted file mode 100644 index b5a72504210..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_test_statement_$%{}[]()&*^!@\"'`\\/#" - --- DROP TRIGGER IF EXISTS "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" ON public.tablefortrigger; - -CREATE TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" - BEFORE INSERT OR DELETE OR TRUNCATE OR UPDATE OF col1, col2, col3 - ON public.tablefortrigger - FOR EACH STATEMENT - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement_msql.sql deleted file mode 100644 index 50c4c59ec22..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_at_statement_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" - BEFORE INSERT OR DELETE OR TRUNCATE OR UPDATE OF col1, col2, col3 - ON public.tablefortrigger - FOR EACH STATEMENT - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger.sql deleted file mode 100644 index 0aede597efd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger_msql.sql deleted file mode 100644 index bc237813a80..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_insert_event_trigger_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger.sql deleted file mode 100644 index ff2a15737df..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger_msql.sql deleted file mode 100644 index cbaf31024e6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_before_update_event_trigger_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (OLD.col2 IS DISTINCT FROM NEW.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/test.json deleted file mode 100644 index e84bcf0985c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/test.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tablefortrigger", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "col2", - "cltype": "text" - }, - { - "name": "col3", - "cltype": "integer" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_function.sql" - }, - { - "type": "create", - "name": "Create before event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_trigger.sql", - "expected_msql_file": "create_before_insert_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) before event trigger", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_before_insert_event_trigger.sql", - "expected_msql_file": "alter_before_insert_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create before update event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "columns": "[\"col1\"]", - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_update_event_trigger.sql", - "expected_msql_file": "create_before_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter before update event trigger enable replica", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "R" - }, - "schema": "public", - "expected_sql_file": "alter_before_update_event_trigger_enable_replica.sql", - "expected_msql_file": "alter_before_update_event_trigger_enable_replica_msql.sql" - }, - { - "type": "create", - "name": "Create after update event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "comment for update event trigger", - "is_constraint_trigger": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2", - "columns": "[\"col2\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_update_event_trigger.sql", - "expected_msql_file": "create_after_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter after update event trigger enable always", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_update_event_trigger_enable_always.sql", - "expected_msql_file": "alter_after_update_event_trigger_enable_always_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on before for multiple events", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_b4r_update_mul_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "multiple event trigger", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_update": true, - "columns": "[\"col3\"]", - "whenclause": "" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_b4r_update_multiple_event_trigger.sql", - "expected_msql_file": "create_b4r_update_multiple_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with arguments", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "delete event trig", - "is_constraint_trigger": true, - "tgdeferrable": true, - "tginitdeferred": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "tgargs": "12", - "evnt_delete": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger.sql", - "expected_msql_file": "create_after_delete_event_trigger_msql.sql" - }, - { - "type": "delete", - "name": "Delete trigger on after delete event with arguments", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#" - }, - "schema": "public" - }, - { - "type": "create", - "name": "Create before event trigger at statement level", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_statement_$%{}[]()&*^!@\\\"'`\\\\/#\"", - "is_row_trigger": false, - "fires": "BEFORE", - "evnt_truncate": true, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_delete": true, - "evnt_update": true, - "whenclause": "", - "columns": "[\"col1\",\"col2\",\"col3\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_at_statement.sql", - "expected_msql_file": "create_before_insert_event_at_statement_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after insert event with transition", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "tgnewtable": "inserted" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) trigger on after inset event with transition", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with transition", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "is_constraint_trigger": false, - "evnt_delete": true, - "tgoldtable": "oldtab" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_delete_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter trigger on after delete event with transition always enable", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_delete_event_trigger_with_transition_msql.sql" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index 5f8e784f820..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index eb49abca275..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_insert_event_trigger.sql deleted file mode 100644 index 0efc8b643e0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_insert_event_trigger.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_update_event_trigger_enable_replica.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_update_event_trigger_enable_replica.sql deleted file mode 100644 index 58bd0232b7d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/alter_before_update_event_trigger_enable_replica.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE REPLICA TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index 8141c56fb16..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition_msql.sql deleted file mode 100644 index 901659639d7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_delete_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index 37481bf9929..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition_msql.sql deleted file mode 100644 index 40a4ad81c82..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_after_insert_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger.sql deleted file mode 100644 index 10ce5f142a0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger_msql.sql deleted file mode 100644 index 532b7821a97..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_trigger_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_update_event_trigger.sql deleted file mode 100644 index 7984195c5ef..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_update_event_trigger.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/test.json deleted file mode 100644 index 60fc20ee9ce..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/test.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tablefortrigger", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "col2", - "cltype": "text" - }, - { - "name": "col3", - "cltype": "integer" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_function.sql" - }, - { - "type": "create", - "name": "Create before event trigger -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_trigger.sql", - "expected_msql_file": "create_before_insert_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) before event trigger", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_before_insert_event_trigger.sql", - "expected_msql_file": "alter_before_insert_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create before update event trigger -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "columns": "[\"col1\"]", - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_update_event_trigger.sql", - "expected_msql_file": "create_before_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter before update event trigger enable replica -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "R" - }, - "schema": "public", - "expected_sql_file": "alter_before_update_event_trigger_enable_replica.sql", - "expected_msql_file": "alter_before_update_event_trigger_enable_replica_msql.sql" - }, - { - "type": "create", - "name": "Create after update event trigger -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "comment for update event trigger", - "is_constraint_trigger": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2", - "columns": "[\"col2\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_update_event_trigger.sql", - "expected_msql_file": "create_after_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter after update event trigger enable always -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_update_event_trigger_enable_always.sql", - "expected_msql_file": "alter_after_update_event_trigger_enable_always_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on before for multiple events -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_b4r_update_mul_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "multiple event trigger", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_update": true, - "columns": "[\"col3\"]", - "whenclause": "" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_b4r_update_multiple_event_trigger.sql", - "expected_msql_file": "create_b4r_update_multiple_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with arguments -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "delete event trig", - "is_constraint_trigger": true, - "tgdeferrable": true, - "tginitdeferred": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "tgargs": "12", - "evnt_delete": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger.sql", - "expected_msql_file": "create_after_delete_event_trigger_msql.sql" - }, - { - "type": "delete", - "name": "Delete trigger on after delete event with arguments -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#" - }, - "schema": "public" - }, - { - "type": "create", - "name": "Create before event trigger at statement level -- 14 plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_statement_$%{}[]()&*^!@\\\"'`\\\\/#\"", - "is_row_trigger": false, - "fires": "BEFORE", - "evnt_truncate": true, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_delete": true, - "evnt_update": true, - "whenclause": "", - "columns": "[\"col1\",\"col2\",\"col3\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_at_statement.sql", - "expected_msql_file": "create_before_insert_event_at_statement_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after insert event with transition -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "tgnewtable": "inserted" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) trigger on after inset event with transition -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with transition -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "is_constraint_trigger": false, - "evnt_delete": true, - "tgoldtable": "oldtab" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_delete_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter trigger on after delete event with transition always enable -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_delete_event_trigger_with_transition_msql.sql" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_delete_event_trigger_with_transition.sql index ece31b34cff..5f8e784f820 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_delete_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_delete_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER DELETE ON public.tablefortrigger REFERENCING OLD TABLE AS oldtab diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_insert_event_trigger_with_transition.sql index c42f6d02ecf..eb49abca275 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_insert_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_after_insert_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER INSERT ON public.tablefortrigger REFERENCING NEW TABLE AS inserted diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_insert_event_trigger.sql index b96080089c9..0efc8b643e0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_insert_event_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_insert_event_trigger.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" BEFORE INSERT ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_update_event_trigger_enable_replica.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_update_event_trigger_enable_replica.sql index 1aae2013e13..58bd0232b7d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_update_event_trigger_enable_replica.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_update_event_trigger_enable_replica.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" BEFORE UPDATE OF col1 ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_update_event_trigger_enable_replica_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_update_event_trigger_enable_replica_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/alter_before_update_event_trigger_enable_replica_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/alter_before_update_event_trigger_enable_replica_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/11_plus/create_after_delete_event_trigger_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition.sql index 92b3b09721d..8141c56fb16 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER DELETE ON public.tablefortrigger REFERENCING OLD TABLE AS oldtab diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition_msql.sql index da0f1bed351..901659639d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_delete_event_trigger_with_transition_msql.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER DELETE ON public.tablefortrigger REFERENCING OLD TABLE AS oldtab diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition.sql index d7d068ee0a4..37481bf9929 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER INSERT ON public.tablefortrigger REFERENCING NEW TABLE AS inserted diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition_msql.sql index c99b2dbf7aa..40a4ad81c82 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_after_insert_event_trigger_with_transition_msql.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER INSERT ON public.tablefortrigger REFERENCING NEW TABLE AS inserted diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_b4r_update_multiple_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_b4r_update_multiple_event_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_b4r_update_multiple_event_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_b4r_update_multiple_event_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_b4r_update_multiple_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_b4r_update_multiple_event_trigger_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_b4r_update_multiple_event_trigger_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_b4r_update_multiple_event_trigger_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_at_statement.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_at_statement.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_at_statement.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_at_statement.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_at_statement_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_at_statement_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_insert_event_at_statement_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_at_statement_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger.sql index 0aede597efd..10ce5f142a0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" BEFORE INSERT ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger_msql.sql index bc237813a80..532b7821a97 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_insert_event_trigger_msql.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" BEFORE INSERT ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_update_event_trigger.sql index ff2a15737df..7984195c5ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_update_event_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_update_event_trigger.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" BEFORE UPDATE OF col1 ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_update_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_update_event_trigger_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/14_plus/create_before_update_event_trigger_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/create_before_update_event_trigger_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/test.json index e84bcf0985c..60fc20ee9ce 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/pg/default/test.json @@ -51,7 +51,7 @@ }, { "type": "create", - "name": "Create before event trigger", + "name": "Create before event trigger -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -85,7 +85,7 @@ }, { "type": "create", - "name": "Create before update event trigger", + "name": "Create before update event trigger -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -107,7 +107,7 @@ }, { "type": "alter", - "name": "Alter before update event trigger enable replica", + "name": "Alter before update event trigger enable replica -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", @@ -121,7 +121,7 @@ }, { "type": "create", - "name": "Create after update event trigger", + "name": "Create after update event trigger -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -144,7 +144,7 @@ }, { "type": "alter", - "name": "Alter after update event trigger enable always", + "name": "Alter after update event trigger enable always -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", @@ -158,7 +158,7 @@ }, { "type": "create", - "name": "Create trigger on before for multiple events", + "name": "Create trigger on before for multiple events -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -181,7 +181,7 @@ }, { "type": "create", - "name": "Create trigger on after delete event with arguments", + "name": "Create trigger on after delete event with arguments -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -205,7 +205,7 @@ }, { "type": "delete", - "name": "Delete trigger on after delete event with arguments", + "name": "Delete trigger on after delete event with arguments -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "data": { @@ -215,7 +215,7 @@ }, { "type": "create", - "name": "Create before event trigger at statement level", + "name": "Create before event trigger at statement level -- 14 plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -239,7 +239,7 @@ }, { "type": "create", - "name": "Create trigger on after insert event with transition", + "name": "Create trigger on after insert event with transition -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -260,7 +260,7 @@ }, { "type": "alter", - "name": "Alter(disable) trigger on after inset event with transition", + "name": "Alter(disable) trigger on after inset event with transition -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", @@ -274,7 +274,7 @@ }, { "type": "create", - "name": "Create trigger on after delete event with transition", + "name": "Create trigger on after delete event with transition -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -296,7 +296,7 @@ }, { "type": "alter", - "name": "Alter trigger on after delete event with transition always enable", + "name": "Alter trigger on after delete event with transition always enable -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index ece31b34cff..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql deleted file mode 100644 index c0f12660911..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_delete_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index c42f6d02ecf..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql deleted file mode 100644 index accfda7493a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_insert_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always.sql deleted file mode 100644 index d5b9767e9d1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE CONSTRAINT TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" - AFTER UPDATE OF col2 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'comment for update event trigger'; - -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always_msql.sql deleted file mode 100644 index 0fd72512301..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_after_update_event_trigger_enable_always_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger.sql deleted file mode 100644 index b96080089c9..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger_msql.sql deleted file mode 100644 index 6d135187951..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_insert_event_trigger_msql.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_update_event_trigger_enable_replica.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_update_event_trigger_enable_replica.sql deleted file mode 100644 index 1aae2013e13..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_update_event_trigger_enable_replica.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE REPLICA TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index 92b3b09721d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition_msql.sql deleted file mode 100644 index da0f1bed351..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index d7d068ee0a4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition_msql.sql deleted file mode 100644 index c99b2dbf7aa..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_insert_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger.sql deleted file mode 100644 index d2894d824f6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE CONSTRAINT TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" - AFTER UPDATE OF col2 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'comment for update event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger_msql.sql deleted file mode 100644 index 6b45691cce8..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_update_event_trigger_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE CONSTRAINT TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" - AFTER UPDATE OF col2 - ON public.tablefortrigger - FOR EACH ROW - WHEN (OLD.col2 IS DISTINCT FROM NEW.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'comment for update event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger.sql deleted file mode 100644 index bf0d6bf5fcd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_b4r_update_mul_events_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT OR UPDATE OF col3 - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'multiple event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger_msql.sql deleted file mode 100644 index db938f9c135..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_b4r_update_multiple_event_trigger_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT OR UPDATE OF col3 - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_b4r_update_mul_events_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'multiple event trigger'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement.sql deleted file mode 100644 index b5a72504210..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_test_statement_$%{}[]()&*^!@\"'`\\/#" - --- DROP TRIGGER IF EXISTS "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" ON public.tablefortrigger; - -CREATE TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" - BEFORE INSERT OR DELETE OR TRUNCATE OR UPDATE OF col1, col2, col3 - ON public.tablefortrigger - FOR EACH STATEMENT - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement_msql.sql deleted file mode 100644 index 50c4c59ec22..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_at_statement_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" - BEFORE INSERT OR DELETE OR TRUNCATE OR UPDATE OF col1, col2, col3 - ON public.tablefortrigger - FOR EACH STATEMENT - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_statement_$%{}[]()&*^!@\""'`\\/#""" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger.sql deleted file mode 100644 index 0aede597efd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger_msql.sql deleted file mode 100644 index bc237813a80..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_insert_event_trigger_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger.sql deleted file mode 100644 index ff2a15737df..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger_msql.sql deleted file mode 100644 index cbaf31024e6..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_before_update_event_trigger_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (OLD.col2 IS DISTINCT FROM NEW.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/test.json deleted file mode 100644 index a79df68bf69..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/test.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tablefortrigger", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "col2", - "cltype": "text" - }, - { - "name": "col3", - "cltype": "integer" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_function.sql" - }, - { - "type": "create", - "name": "Create before event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_trigger.sql", - "expected_msql_file": "create_before_insert_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) before event trigger", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_before_insert_event_trigger.sql", - "expected_msql_file": "alter_before_insert_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create before update event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "columns": "[\"col1\"]", - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_update_event_trigger.sql", - "expected_msql_file": "create_before_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter before update event trigger enable replica", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "R" - }, - "schema": "public", - "expected_sql_file": "alter_before_update_event_trigger_enable_replica.sql", - "expected_msql_file": "alter_before_update_event_trigger_enable_replica_msql.sql" - }, - { - "type": "create", - "name": "Create after update event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "comment for update event trigger", - "is_constraint_trigger": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2", - "columns": "[\"col2\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_update_event_trigger.sql", - "expected_msql_file": "create_after_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter after update event trigger enable always", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_update_event_trigger_enable_always.sql", - "expected_msql_file": "alter_after_update_event_trigger_enable_always_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on before for multiple events", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_b4r_update_mul_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "multiple event trigger", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_update": true, - "columns": "[\"col3\"]", - "whenclause": "" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_b4r_update_multiple_event_trigger.sql", - "expected_msql_file": "create_b4r_update_multiple_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with arguments", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "delete event trig", - "is_constraint_trigger": true, - "tgdeferrable": true, - "tginitdeferred": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "tgargs": "12", - "evnt_delete": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger.sql", - "expected_msql_file": "create_after_delete_event_trigger_msql.sql" - }, - { - "type": "delete", - "name": "Delete trigger on after delete event with arguments", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#" - }, - "schema": "public" - }, - { - "type": "create", - "name": "Create before event trigger at statement level", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_statement_$%{}[]()&*^!@\\\"'`\\\\/#\"", - "is_row_trigger": false, - "fires": "BEFORE", - "evnt_truncate": true, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_delete": true, - "evnt_update": true, - "whenclause": "", - "columns": "[\"col1\",\"col2\",\"col3\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_at_statement.sql", - "expected_msql_file": "create_before_insert_event_at_statement_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after insert event with transition", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "tgnewtable": "inserted" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) trigger on after inset event with transition", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with transition", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "is_constraint_trigger": false, - "evnt_delete": true, - "tgoldtable": "oldtab" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_delete_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter trigger on after delete event with transition always enable", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_delete_event_trigger_with_transition_msql.sql" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index 5f8e784f820..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE ALWAYS TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index eb49abca275..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_insert_event_trigger.sql deleted file mode 100644 index 0efc8b643e0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_insert_event_trigger.sql +++ /dev/null @@ -1,15 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - DISABLE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_update_event_trigger_enable_replica.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_update_event_trigger_enable_replica.sql deleted file mode 100644 index 58bd0232b7d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/alter_before_update_event_trigger_enable_replica.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; - -ALTER TABLE public.tablefortrigger - ENABLE REPLICA TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition.sql deleted file mode 100644 index 8141c56fb16..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_delete_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition_msql.sql deleted file mode 100644 index 901659639d7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_delete_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER DELETE - ON public.tablefortrigger - REFERENCING OLD TABLE AS oldtab - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition.sql deleted file mode 100644 index 37481bf9929..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_after_insert_events_with_transition_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition_msql.sql deleted file mode 100644 index 40a4ad81c82..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_after_insert_event_trigger_with_transition_msql.sql +++ /dev/null @@ -1,9 +0,0 @@ -CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" - AFTER INSERT - ON public.tablefortrigger - REFERENCING NEW TABLE AS inserted - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger.sql deleted file mode 100644 index 10ce5f142a0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger.sql +++ /dev/null @@ -1,12 +0,0 @@ --- Trigger: trig_test_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger_msql.sql deleted file mode 100644 index 532b7821a97..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_trigger_msql.sql +++ /dev/null @@ -1,8 +0,0 @@ -CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" - BEFORE INSERT - ON public.tablefortrigger - FOR EACH ROW - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_update_event_trigger.sql deleted file mode 100644 index 7984195c5ef..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_update_event_trigger.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Trigger: trig_be4r_update_$%{}[]()&*^!@"'`\/# - --- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; - -CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" - BEFORE UPDATE OF col1 - ON public.tablefortrigger - FOR EACH ROW - WHEN (old.col2 IS DISTINCT FROM new.col2) - EXECUTE FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); - -COMMENT ON TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger - IS 'test comment'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/test.json deleted file mode 100644 index b53ec8203d3..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/test.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "tablefortrigger", - "columns": [ - { - "name": "col1", - "cltype": "integer", - "is_primary_key": true - }, - { - "name": "col2", - "cltype": "text" - }, - { - "name": "col3", - "cltype": "integer" - } - ], - "is_partitioned": false, - "schema": "public", - "spcname": "pg_default" - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create trigger function", - "endpoint": "NODE-trigger_function.obj", - "sql_endpoint": "NODE-trigger_function.sql_id", - "data": { - "name": "Trig1_$%{}[]()&*^!@\"'`\\/#", - "acl": [], - "args": [], - "funcowner": "enterprisedb", - "lanname": "plpgsql", - "options": [], - "pronamespace": 2200, - "prorettypename": "trigger", - "prosrc": "begin\nselect 1;\nend;", - "seclabels": [], - "variables": [], - "schema": "public" - }, - "expected_sql_file": "create_plain_trigger_function.sql" - }, - { - "type": "create", - "name": "Create before event trigger -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_trigger.sql", - "expected_msql_file": "create_before_insert_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) before event trigger -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_test_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_before_insert_event_trigger.sql", - "expected_msql_file": "alter_before_insert_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create before update event trigger -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "columns": "[\"col1\"]", - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_update_event_trigger.sql", - "expected_msql_file": "create_before_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter before update event trigger enable replica -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_be4r_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "R" - }, - "schema": "public", - "expected_sql_file": "alter_before_update_event_trigger_enable_replica.sql", - "expected_msql_file": "alter_before_update_event_trigger_enable_replica_msql.sql" - }, - { - "type": "create", - "name": "Create after update event trigger", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "comment for update event trigger", - "is_constraint_trigger": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_update": true, - "whenclause": "OLD.col2 IS DISTINCT FROM NEW.col2", - "columns": "[\"col2\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_update_event_trigger.sql", - "expected_msql_file": "create_after_update_event_trigger_msql.sql" - }, - { - "type": "alter", - "name": "Alter after update event trigger enable always", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_update_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_update_event_trigger_enable_always.sql", - "expected_msql_file": "alter_after_update_event_trigger_enable_always_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on before for multiple events -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_b4r_update_mul_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "BEFORE", - "evnt_truncate": false, - "description": "multiple event trigger", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_update": true, - "columns": "[\"col3\"]", - "whenclause": "" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_b4r_update_multiple_event_trigger.sql", - "expected_msql_file": "create_b4r_update_multiple_event_trigger_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with arguments", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "delete event trig", - "is_constraint_trigger": true, - "tgdeferrable": true, - "tginitdeferred": true, - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "tgargs": "12", - "evnt_delete": true - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger.sql", - "expected_msql_file": "create_after_delete_event_trigger_msql.sql" - }, - { - "type": "delete", - "name": "Delete trigger on after delete event with arguments", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "data": { - "name": "trig_after_delete_events_$%{}[]()&*^!@\"'`\\/#" - }, - "schema": "public" - }, - { - "type": "create", - "name": "Create before event trigger at statement level -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_test_statement_$%{}[]()&*^!@\\\"'`\\\\/#\"", - "is_row_trigger": false, - "fires": "BEFORE", - "evnt_truncate": true, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "evnt_delete": true, - "evnt_update": true, - "whenclause": "", - "columns": "[\"col1\",\"col2\",\"col3\"]" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_before_insert_event_at_statement.sql", - "expected_msql_file": "create_before_insert_event_at_statement_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after insert event with transition -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "evnt_insert": true, - "tgnewtable": "inserted" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter(disable) trigger on after inset event with transition -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_insert_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "D" - }, - "schema": "public", - "expected_sql_file": "alter_after_insert_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_insert_event_trigger_with_transition_msql.sql" - }, - { - "type": "create", - "name": "Create trigger on after delete event with transition -- 14 Plus", - "endpoint": "NODE-trigger.obj", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_row_trigger": true, - "fires": "AFTER", - "evnt_truncate": false, - "description": "test comment", - "tfunction": "public.\"Trig1_$%{}[]()&*^!@\"\"'`\\/#\"", - "is_constraint_trigger": false, - "evnt_delete": true, - "tgoldtable": "oldtab" - }, - "schema": "public", - "store_object_id": true, - "expected_sql_file": "create_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "create_after_delete_event_trigger_with_transition_msql.sql" - }, - { - "type": "alter", - "name": "Alter trigger on after delete event with transition always enable -- 14 Plus", - "endpoint": "NODE-trigger.obj_id", - "sql_endpoint": "NODE-trigger.sql_id", - "msql_endpoint": "NODE-trigger.msql_id", - "data": { - "name": "trig_after_delete_events_with_transition_$%{}[]()&*^!@\"'`\\/#", - "is_enable_trigger": "A" - }, - "schema": "public", - "expected_sql_file": "alter_after_delete_event_trigger_with_transition.sql", - "expected_msql_file": "alter_after_delete_event_trigger_with_transition_msql.sql" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_delete_event_trigger_with_transition.sql index ece31b34cff..5f8e784f820 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_delete_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_delete_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER DELETE ON public.tablefortrigger REFERENCING OLD TABLE AS oldtab diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_insert_event_trigger_with_transition.sql index c42f6d02ecf..eb49abca275 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_insert_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_after_insert_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER INSERT ON public.tablefortrigger REFERENCING NEW TABLE AS inserted diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_insert_event_trigger.sql index b96080089c9..0efc8b643e0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_insert_event_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_insert_event_trigger.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" BEFORE INSERT ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_update_event_trigger_enable_replica.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_update_event_trigger_enable_replica.sql index 1aae2013e13..58bd0232b7d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_update_event_trigger_enable_replica.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_update_event_trigger_enable_replica.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" BEFORE UPDATE OF col1 ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_update_event_trigger_enable_replica_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_update_event_trigger_enable_replica_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/alter_before_update_event_trigger_enable_replica_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/alter_before_update_event_trigger_enable_replica_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/11_plus/create_after_delete_event_trigger_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition.sql index 92b3b09721d..8141c56fb16 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER DELETE ON public.tablefortrigger REFERENCING OLD TABLE AS oldtab diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition_msql.sql index da0f1bed351..901659639d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_delete_event_trigger_with_transition_msql.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_delete_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER DELETE ON public.tablefortrigger REFERENCING OLD TABLE AS oldtab diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition.sql index d7d068ee0a4..37481bf9929 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER INSERT ON public.tablefortrigger REFERENCING NEW TABLE AS inserted diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition_msql.sql index c99b2dbf7aa..40a4ad81c82 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_after_insert_event_trigger_with_transition_msql.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_after_insert_events_with_transition_$%{}[]()&*^!@""'`\/#" AFTER INSERT ON public.tablefortrigger REFERENCING NEW TABLE AS inserted diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_b4r_update_multiple_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_b4r_update_multiple_event_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_b4r_update_multiple_event_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_b4r_update_multiple_event_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_b4r_update_multiple_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_b4r_update_multiple_event_trigger_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_b4r_update_multiple_event_trigger_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_b4r_update_multiple_event_trigger_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_at_statement.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_at_statement.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_at_statement.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_at_statement.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_at_statement_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_at_statement_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_insert_event_at_statement_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_at_statement_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger.sql index 0aede597efd..10ce5f142a0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_test_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" BEFORE INSERT ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger_msql.sql index bc237813a80..532b7821a97 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_insert_event_trigger_msql.sql @@ -1,4 +1,4 @@ -CREATE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_test_$%{}[]()&*^!@""'`\/#" BEFORE INSERT ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_update_event_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_update_event_trigger.sql index ff2a15737df..7984195c5ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_update_event_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_update_event_trigger.sql @@ -2,7 +2,7 @@ -- DROP TRIGGER IF EXISTS "trig_be4r_update_$%{}[]()&*^!@""'`\/#" ON public.tablefortrigger; -CREATE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" +CREATE OR REPLACE TRIGGER "trig_be4r_update_$%{}[]()&*^!@""'`\/#" BEFORE UPDATE OF col1 ON public.tablefortrigger FOR EACH ROW diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_update_event_trigger_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_update_event_trigger_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/14_plus/create_before_update_event_trigger_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/create_before_update_event_trigger_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/test.json index a79df68bf69..b53ec8203d3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/tests/ppas/default/test.json @@ -51,7 +51,7 @@ }, { "type": "create", - "name": "Create before event trigger", + "name": "Create before event trigger -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -71,7 +71,7 @@ }, { "type": "alter", - "name": "Alter(disable) before event trigger", + "name": "Alter(disable) before event trigger -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", @@ -85,7 +85,7 @@ }, { "type": "create", - "name": "Create before update event trigger", + "name": "Create before update event trigger -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -107,7 +107,7 @@ }, { "type": "alter", - "name": "Alter before update event trigger enable replica", + "name": "Alter before update event trigger enable replica -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", @@ -158,7 +158,7 @@ }, { "type": "create", - "name": "Create trigger on before for multiple events", + "name": "Create trigger on before for multiple events -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -215,7 +215,7 @@ }, { "type": "create", - "name": "Create before event trigger at statement level", + "name": "Create before event trigger at statement level -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -239,7 +239,7 @@ }, { "type": "create", - "name": "Create trigger on after insert event with transition", + "name": "Create trigger on after insert event with transition -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -260,7 +260,7 @@ }, { "type": "alter", - "name": "Alter(disable) trigger on after inset event with transition", + "name": "Alter(disable) trigger on after inset event with transition -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", @@ -274,7 +274,7 @@ }, { "type": "create", - "name": "Create trigger on after delete event with transition", + "name": "Create trigger on after delete event with transition -- 14 Plus", "endpoint": "NODE-trigger.obj", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql", @@ -296,7 +296,7 @@ }, { "type": "alter", - "name": "Alter trigger on after delete event with transition always enable", + "name": "Alter trigger on after delete event with transition always enable -- 14 Plus", "endpoint": "NODE-trigger.obj_id", "sql_endpoint": "NODE-trigger.sql_id", "msql_endpoint": "NODE-trigger.msql_id", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/additional_properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/additional_properties.sql deleted file mode 100644 index 0f5ae39944b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/additional_properties.sql +++ /dev/null @@ -1,45 +0,0 @@ -{# The SQL given below will fetch composite type#} -{% if typtype == 'c' %} -SELECT attnum, attname, pg_catalog.format_type(t.oid,NULL) AS typname, attndims, atttypmod, nsp.nspname, - (SELECT COUNT(1) from pg_catalog.pg_type t2 WHERE t2.typname=t.typname) > 1 AS isdup, - collname, nspc.nspname as collnspname, att.attrelid, - pg_catalog.format_type(t.oid, att.atttypmod) AS fulltype, - CASE WHEN t.typelem > 0 THEN t.typelem ELSE t.oid END as elemoid -FROM pg_catalog.pg_attribute att - JOIN pg_catalog.pg_type t ON t.oid=atttypid - JOIN pg_catalog.pg_namespace nsp ON t.typnamespace=nsp.oid - LEFT OUTER JOIN pg_catalog.pg_type b ON t.typelem=b.oid - LEFT OUTER JOIN pg_catalog.pg_collation c ON att.attcollation=c.oid - LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON c.collnamespace=nspc.oid - WHERE att.attrelid = {{typrelid}}::oid - ORDER by attnum; -{% endif %} - -{# The SQL given below will fetch enum type#} -{% if typtype == 'e' %} -SELECT enumlabel -FROM pg_catalog.pg_enum - WHERE enumtypid={{tid}}::oid - ORDER by enumsortorder -{% endif %} - -{# The SQL given below will fetch range type#} -{% if typtype == 'r' %} -SELECT rngsubtype, st.typname, - rngcollation, mt.typname as rngmultirangetype, - CASE WHEN n.nspname IS NOT NULL THEN pg_catalog.concat(pg_catalog.quote_ident(n.nspname), '.', pg_catalog.quote_ident(col.collname)) ELSE col.collname END AS collname, - rngsubopc, opc.opcname, - rngcanonical, rngsubdiff as rngsubdiff_proc, - CASE WHEN length(ns.nspname::text) > 0 AND length(pgpr.proname::text) > 0 THEN - pg_catalog.concat(quote_ident(ns.nspname), '.', pg_catalog.quote_ident(pgpr.proname)) - ELSE '' END AS rngsubdiff -FROM pg_catalog.pg_range - LEFT JOIN pg_catalog.pg_type st ON st.oid=rngsubtype - LEFT JOIN pg_catalog.pg_type mt ON mt.oid=rngmultitypid - LEFT JOIN pg_catalog.pg_collation col ON col.oid=rngcollation - LEFT JOIN pg_catalog.pg_namespace n ON col.collnamespace=n.oid - LEFT JOIN pg_catalog.pg_opclass opc ON opc.oid=rngsubopc - LEFT JOIN pg_catalog.pg_proc pgpr ON pgpr.oid = rngsubdiff - LEFT JOIN pg_catalog.pg_namespace ns ON ns.oid=pgpr.pronamespace - WHERE rngtypid={{tid}}::oid; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/create.sql deleted file mode 100644 index 924eaa483cb..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/create.sql +++ /dev/null @@ -1,86 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% 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) }}; -{% endif %} -{### Composite Type ###} -{% if data and data.typtype == 'c' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS -({{"\n\t"}}{% if data.composite %}{% for d in data.composite %}{% if loop.index != 1 %},{{"\n\t"}}{% endif %}{{ conn|qtIdent(d.member_name) }} {% if is_sql %}{{ d.fulltype }}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, d.cltype, d.tlength, d.precision, d.hasSqrBracket) }}{% endif %}{% if d.collation %} COLLATE {{d.collation}}{% endif %}{% endfor %}{% endif %}{{"\n"}}); -{% endif %} -{### Enum Type ###} -{% if data and data.typtype == 'e' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS ENUM - ({% for e in data.enum %}{% if loop.index != 1 %}, {% endif %}{{ e.label|qtLiteral(conn) }}{% endfor %}); -{% endif %} -{### Range Type ###} -{% if data and data.typtype == 'r' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS RANGE -( - {% if data.typname %}SUBTYPE={{ conn|qtTypeIdent(data.typname) }}{% endif %}{% if data.collname %}, - COLLATION = {{ data.collname }}{% endif %}{% if data.opcname %}, - SUBTYPE_OPCLASS = {{ data.opcname }}{% endif %}{% if data.rngcanonical %}, - CANONICAL = {{ data.rngcanonical }}{% endif %}{% if data.rngsubdiff %}, - SUBTYPE_DIFF = {{ data.rngsubdiff }}{% endif %}{% if data.rngmultirangetype %}, - MULTIRANGE_TYPE_NAME = {{ data.rngmultirangetype }}{% endif %} - -); -{% endif %} -{### External Type ###} -{% if data and data.typtype == 'b' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} - -( - {% if data.typinput %}INPUT = {{data.typinput}}{% endif %}{% if data.typoutput %}, - OUTPUT = {{ data.typoutput }}{% endif %}{% if data.typreceive %}, - RECEIVE = {{data.typreceive}}{% endif %}{% if data.typsend %}, - SEND = {{data.typsend}}{% endif %}{% if data.typmodin %}, - TYPMOD_IN = {{data.typmodin}}{% endif %}{% if data.typmodout %}, - TYPMOD_OUT = {{data.typmodout}}{% endif %}{% if data.typanalyze %}, - ANALYZE = {{data.typanalyze}}{% endif %}{% if data.typsubscript %}, - SUBSCRIPT = {{data.typsubscript}}{% endif %}{% if data.typlen %}, - INTERNALLENGTH = {{data.typlen}}{% endif %}{% if data.typbyval %}, - PASSEDBYVALUE{% endif %}{% if data.typalign %}, - ALIGNMENT = {{data.typalign}}{% endif %}{% if data.typstorage %}, - STORAGE = {{data.typstorage}}{% endif %}{% if data.typcategory %}, - CATEGORY = {{data.typcategory|qtLiteral(conn)}}{% endif %}{% if data.typispreferred %}, - PREFERRED = {{data.typispreferred}}{% endif %}{% if data.typdefault %}, - DEFAULT = {{data.typdefault|qtLiteral(conn)}}{% endif %}{% if data.element %}, - ELEMENT = {{data.element}}{% endif %}{% if data.typdelim %}, - DELIMITER = {{data.typdelim|qtLiteral(conn)}}{% endif %}{% if data.is_collatable %}, - COLLATABLE = {{data.is_collatable}}{% endif %} - -); -{% endif %} -{### Type Owner ###} -{% if data and data.typeowner %} - -ALTER TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} - - OWNER TO {{ conn|qtIdent(data.typeowner) }}; -{% endif %} -{### Type Comments ###} -{% if data and data.description %} - -COMMENT ON TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} - - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{### ACL ###} -{% if data.typacl %} - -{% for priv in data.typacl %} -{{ PRIVILEGE.SET(conn, 'TYPE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if data.seclabels %} - -{% for r in data.seclabels %} -{% if r.provider and r.label %} -{{ SECLABEL.SET(conn, 'TYPE', data.name, r.provider, r.label, data.schema) }} -{% endif %} -{% endfor %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/nodes.sql deleted file mode 100644 index 9469379f530..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/nodes.sql +++ /dev/null @@ -1,19 +0,0 @@ -SELECT t.oid, t.typname AS name, des.description, ra.rngmultitypid as rngmultirangetype -FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_range ra ON ra.rngtypid=t.oid - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = t.typnamespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_type'::regclass) -WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' AND t.typnamespace = {{scid}}::oid -{% if tid %} - AND t.oid = {{tid}}::oid -{% endif %} -{% if not show_system_objects %} - AND ct.oid is NULL -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} -ORDER BY t.typname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql deleted file mode 100644 index 62d625c0017..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/properties.sql +++ /dev/null @@ -1,45 +0,0 @@ -SELECT t.oid, t.typname AS name, - (CASE WHEN CAST(coalesce(t.typcollation, '0') AS integer) = 100 THEN true ElSE false END) AS is_collatable, - t.typacl AS type_acl, - t.typnamespace, t.typowner, t.typlen, t.typbyval, t.typtype, - t.typcategory, t.typispreferred, t.typisdefined, t.typdelim, - t.typrelid, t.typelem, t.typarray, t.typalign, t.typstorage, - t.typnotnull, t.typbasetype, t.typtypmod, t.typndims, - t.typcollation, t.typdefaultbin, t.typdefault, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typinput::oid) AS typinput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typoutput::oid) AS typoutput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typreceive::oid) AS typreceive, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typsend::oid) AS typsend, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typmodin::oid) AS typmodin, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typmodout::oid) AS typmodout, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typanalyze::oid) AS typanalyze, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typsubscript::oid) AS typsubscript, - pg_catalog.format_type(t.oid, null) AS alias, - pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, - description, ct.oid AS taboid, - nsp.nspname AS schema, - --MinimumVersion 9.1 START - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabel sl1 WHERE sl1.objoid=t.oid) AS seclabels, - -- END - (CASE WHEN (t.oid <= {{ datlastsysoid}}::oid OR ct.oid != 0) THEN true ElSE false END) AS is_sys_type -FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_type'::regclass) - LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = t.typnamespace -WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' AND t.typnamespace = {{scid}}::oid -{% if tid %} - AND t.oid = {{tid}}::oid -{% endif %} -{% if not show_system_objects %} - AND ct.oid is NULL -{% endif %} -ORDER BY t.typname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/update.sql deleted file mode 100644 index 008b3e8e1c1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/14_plus/update.sql +++ /dev/null @@ -1,183 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% 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 %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - OWNER TO {{ conn|qtIdent(data.typeowner) }}; - -{% endif %} -{#======================================#} -{# Below will change objects comment #} -{% if data.description is defined and data.description != o_data.description %} -COMMENT ON TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - IS {{ data.description|qtLiteral(conn) }}; - -{% endif %} -{#======================================#} -{### The sql given below will update composite type ###} -{% if data.composite and data.composite|length > 0 %} -{% set composite = data.composite %} -{% if 'deleted' in composite and composite.deleted|length > 0 %} -{% for r in composite.deleted %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - DROP ATTRIBUTE {{conn|qtIdent(r.member_name)}}; -{% endfor %} -{% endif %} -{% if 'added' in composite and composite.added|length > 0 %} -{% for r in composite.added %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ADD ATTRIBUTE {{conn|qtIdent(r.member_name)}} {{ GET_TYPE.CREATE_TYPE_SQL(conn, r.cltype, r.tlength, r.precision, r.hasSqrBracket) }}{% if r.collation %} - COLLATE {{r.collation}}{% endif %}; -{% endfor %} -{% endif %} -{% if 'changed' in composite and composite.changed|length > 0 %} -{% for r in composite.changed %} -{% for o in o_data.composite %} -{##### Variables for the loop #####} -{% set member_name = o.member_name %} -{% set cltype = o.cltype %} -{% set tlength = o.tlength %} -{% set precision = o.precision %} -{% set hasSqrBracket = o.hasSqrBracket %} -{##### If member name changed #####} -{% if o.attnum == r.attnum %} -{% if r.member_name and o.member_name != r.member_name %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME ATTRIBUTE {{o.member_name}} TO {{r.member_name}}; -{% set member_name = r.member_name %} -{% endif %} -{##### If type changed #####} -{% if r.cltype and cltype != r.cltype %} -{% set cltype = r.cltype %} -{% set hasSqrBracket = r.hasSqrBracket %} -{##### If length is not allowed on type #####} -{% if not r.is_tlength %} -{% set tlength = 0 %} -{% set precision = 0 %} -{% endif %} -{% endif %} -{##### If length changed #####} -{% if r.tlength and tlength != r.tlength %} -{% set tlength = r.tlength %} -{% endif %} -{##### If precision changed #####} -{% if tlength and r.precision and precision != r.precision %} -{% set precision = r.precision %} -{% endif %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ALTER ATTRIBUTE {{conn|qtIdent(member_name)}} SET DATA TYPE {{ GET_TYPE.CREATE_TYPE_SQL(conn, cltype, tlength, precision, hasSqrBracket) }}{% if r.collation %} - COLLATE {{r.collation}}{% endif %}; -{% endif%} -{% endfor %} -{% endfor %} -{% endif %} -{% endif %} -{#======================================#} -{### The sql given below will update enum type ###} -{% if data.enum and data.enum|length > 0 %} -{% set enum = data.enum %} -{% set o_enum_len = o_data.enum|length %} -{# We need actual list index from length #} -{% set o_enum_len = o_enum_len - 1 %} -{% if 'added' in enum and enum.added|length > 0 %} -{% for r in enum.added %} -{% set c_idx = loop.index %} -{% if c_idx == 1 %} -{# if first new element then add it after old data enum list#} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ADD VALUE {{r.label|qtLiteral(conn)}} {% if o_enum_len > 0 %}AFTER {{o_data.enum[o_enum_len].label|qtLiteral(conn) }}{% endif %}; -{% else %} -{# if first new element then add it after new data enum list#} -{% set p_idx = loop.index - 2 %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ADD VALUE {{r.label|qtLiteral(conn)}} AFTER {{enum.added[p_idx].label|qtLiteral(conn)}}; -{% endif %} -{% endfor %} -{% endif %} - -{% if 'changed' in enum and enum.changed|length > 0 %} -{% for r in enum.changed %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME VALUE {{r.old_label|qtLiteral(conn)}} TO {{r.label|qtLiteral(conn)}}; -{% endfor %} -{% endif %} - -{% endif %} -{#======================================#} -{### The sql given below will update External type ###} -{% if (data.typreceive is defined and data.typreceive != o_data.typreceive) or (data.typsend is defined and data.typsend != o_data.typsend) or (data.typmodin is defined and data.typmodin != o_data.typmodin) or (data.typmodout is defined and data.typmodout != o_data.typmodout) or (data.typanalyze is defined and data.typanalyze != o_data.typanalyze) or (data.typsubscript is defined and data.typsubscript != o_data.typsubscript) or (data.typstorage is defined and data.typstorage != o_data.typstorage)%} -{% set ns = namespace(add_comma=false) %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} SET ( - {% if data.typreceive is defined %}RECEIVE = {{data.typreceive}}{% set ns.add_comma = true%}{% endif %}{% if data.typsend is defined %}{% if ns.add_comma %}, - {% endif %}SEND = {{data.typsend}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodin is defined %}{% if ns.add_comma %}, - {% endif %}TYPMOD_IN = {{data.typmodin}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodout is defined %}{% if ns.add_comma %}, - {% endif %}TYPMOD_OUT = {{data.typmodout}}{% set ns.add_comma = true%}{% endif %}{% if data.typanalyze is defined %}{% if ns.add_comma %}, - {% endif %}ANALYZE = {{data.typanalyze}}{% set ns.add_comma = true%}{% endif %}{% if data.typsubscript is defined %}{% if ns.add_comma %}, - {% endif %}SUBSCRIPT = {{data.typsubscript}}{% set ns.add_comma = true%}{% endif %}{% if data.typstorage is defined %}{% if ns.add_comma %}, - {% endif %}STORAGE = {{data.typstorage}}{% endif %} - -); -{% endif %} -{#======================================#} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'TYPE', o_data.name, r.provider, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'TYPE', o_data.name, r.provider, r.label, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'TYPE', o_data.name, r.provider, r.label, o_data.schema) }} -{% endfor %} -{% endif %} - -{% endif %} -{#======================================#} -{# Change the privileges #} -{% if data.typacl and data.typacl|length > 0 %} -{% if 'deleted' in data.typacl %} -{% for priv in data.typacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TYPE', priv.grantee, o_data.name, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.typacl %} -{% for priv in data.typacl.changed %} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TYPE', priv.old_grantee, o_data.name, o_data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TYPE', priv.grantee, o_data.name, o_data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TYPE', priv.grantee, o_data.name, priv.without_grant, priv.with_grant, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in data.typacl %} -{% for priv in data.typacl.added %} -{{ PRIVILEGE.SET(conn, 'TYPE', priv.grantee, o_data.name, priv.without_grant, priv.with_grant, o_data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{#======================================#} -{# Below will change object name #} -{% if data.name and data.name != o_data.name %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{#======================================#} -{# Below will change the schema for object #} -{# with extra if condition we will also make sure that object has correct name #} -{% if data.schema and data.schema != o_data.schema %} -ALTER TYPE {% if data.name and data.name != o_data.name %}{{ conn|qtIdent(o_data.schema, data.name) }} -{% else %}{{ conn|qtIdent(o_data.schema, o_data.name) }} -{% endif %} - SET SCHEMA {{ conn|qtIdent(data.schema) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/additional_properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/additional_properties.sql index a953bbf91c7..0f5ae39944b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/additional_properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/additional_properties.sql @@ -26,7 +26,7 @@ FROM pg_catalog.pg_enum {# The SQL given below will fetch range type#} {% if typtype == 'r' %} SELECT rngsubtype, st.typname, - rngcollation, + rngcollation, mt.typname as rngmultirangetype, CASE WHEN n.nspname IS NOT NULL THEN pg_catalog.concat(pg_catalog.quote_ident(n.nspname), '.', pg_catalog.quote_ident(col.collname)) ELSE col.collname END AS collname, rngsubopc, opc.opcname, rngcanonical, rngsubdiff as rngsubdiff_proc, @@ -35,6 +35,7 @@ SELECT rngsubtype, st.typname, ELSE '' END AS rngsubdiff FROM pg_catalog.pg_range LEFT JOIN pg_catalog.pg_type st ON st.oid=rngsubtype + LEFT JOIN pg_catalog.pg_type mt ON mt.oid=rngmultitypid LEFT JOIN pg_catalog.pg_collation col ON col.oid=rngcollation LEFT JOIN pg_catalog.pg_namespace n ON col.collnamespace=n.oid LEFT JOIN pg_catalog.pg_opclass opc ON opc.oid=rngsubopc diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/create.sql index a2d4da1b03a..924eaa483cb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/create.sql @@ -23,7 +23,8 @@ CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% els COLLATION = {{ data.collname }}{% endif %}{% if data.opcname %}, SUBTYPE_OPCLASS = {{ data.opcname }}{% endif %}{% if data.rngcanonical %}, CANONICAL = {{ data.rngcanonical }}{% endif %}{% if data.rngsubdiff %}, - SUBTYPE_DIFF = {{ data.rngsubdiff }}{% endif %} + SUBTYPE_DIFF = {{ data.rngsubdiff }}{% endif %}{% if data.rngmultirangetype %}, + MULTIRANGE_TYPE_NAME = {{ data.rngmultirangetype }}{% endif %} ); {% endif %} @@ -38,7 +39,8 @@ CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% els SEND = {{data.typsend}}{% endif %}{% if data.typmodin %}, TYPMOD_IN = {{data.typmodin}}{% endif %}{% if data.typmodout %}, TYPMOD_OUT = {{data.typmodout}}{% endif %}{% if data.typanalyze %}, - ANALYZE = {{data.typanalyze}}{% endif %}{% if data.typlen %}, + ANALYZE = {{data.typanalyze}}{% endif %}{% if data.typsubscript %}, + SUBSCRIPT = {{data.typsubscript}}{% endif %}{% if data.typlen %}, INTERNALLENGTH = {{data.typlen}}{% endif %}{% if data.typbyval %}, PASSEDBYVALUE{% endif %}{% if data.typalign %}, ALIGNMENT = {{data.typalign}}{% endif %}{% if data.typstorage %}, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/nodes.sql index 8032959e111..9469379f530 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/nodes.sql @@ -1,6 +1,7 @@ -SELECT t.oid, t.typname AS name, des.description +SELECT t.oid, t.typname AS name, des.description, ra.rngmultitypid as rngmultirangetype FROM pg_catalog.pg_type t LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem + LEFT OUTER JOIN pg_catalog.pg_range ra ON ra.rngtypid=t.oid LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = t.typnamespace LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_type'::regclass) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql index 400c742140a..62d625c0017 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/properties.sql @@ -20,6 +20,8 @@ SELECT t.oid, t.typname AS name, WHERE pr.oid = t.typmodout::oid) AS typmodout, (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typanalyze::oid) AS typanalyze, + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid + WHERE pr.oid = t.typsubscript::oid) AS typsubscript, pg_catalog.format_type(t.oid, null) AS alias, pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, description, ct.oid AS taboid, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/update.sql index 20200cc76c2..008b3e8e1c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/pg/sql/default/update.sql @@ -107,14 +107,15 @@ ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} {% endif %} {#======================================#} {### The sql given below will update External type ###} -{% if (data.typreceive is defined and data.typreceive != o_data.typreceive) or (data.typsend is defined and data.typsend != o_data.typsend) or (data.typmodin is defined and data.typmodin != o_data.typmodin) or (data.typmodout is defined and data.typmodout != o_data.typmodout) or (data.typanalyze is defined and data.typanalyze != o_data.typanalyze) or (data.typstorage is defined and data.typstorage != o_data.typstorage)%} +{% if (data.typreceive is defined and data.typreceive != o_data.typreceive) or (data.typsend is defined and data.typsend != o_data.typsend) or (data.typmodin is defined and data.typmodin != o_data.typmodin) or (data.typmodout is defined and data.typmodout != o_data.typmodout) or (data.typanalyze is defined and data.typanalyze != o_data.typanalyze) or (data.typsubscript is defined and data.typsubscript != o_data.typsubscript) or (data.typstorage is defined and data.typstorage != o_data.typstorage)%} {% set ns = namespace(add_comma=false) %} ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} SET ( {% if data.typreceive is defined %}RECEIVE = {{data.typreceive}}{% set ns.add_comma = true%}{% endif %}{% if data.typsend is defined %}{% if ns.add_comma %}, {% endif %}SEND = {{data.typsend}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodin is defined %}{% if ns.add_comma %}, {% endif %}TYPMOD_IN = {{data.typmodin}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodout is defined %}{% if ns.add_comma %}, {% endif %}TYPMOD_OUT = {{data.typmodout}}{% set ns.add_comma = true%}{% endif %}{% if data.typanalyze is defined %}{% if ns.add_comma %}, - {% endif %}ANALYZE = {{data.typanalyze}}{% set ns.add_comma = true%}{% endif %}{% if data.typstorage is defined %}{% if ns.add_comma %}, + {% endif %}ANALYZE = {{data.typanalyze}}{% set ns.add_comma = true%}{% endif %}{% if data.typsubscript is defined %}{% if ns.add_comma %}, + {% endif %}SUBSCRIPT = {{data.typsubscript}}{% set ns.add_comma = true%}{% endif %}{% if data.typstorage is defined %}{% if ns.add_comma %}, {% endif %}STORAGE = {{data.typstorage}}{% endif %} ); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/additional_properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/additional_properties.sql deleted file mode 100644 index b186b762f0c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/additional_properties.sql +++ /dev/null @@ -1,64 +0,0 @@ -{# The SQL given below will fetch composite type#} -{% if typtype == 'c' %} -SELECT attnum, attname, pg_catalog.format_type(t.oid,NULL) AS typname, attndims, atttypmod, nsp.nspname, - (SELECT COUNT(1) from pg_catalog.pg_type t2 WHERE t2.typname=t.typname) > 1 AS isdup, - collname, nspc.nspname as collnspname, att.attrelid, - pg_catalog.format_type(t.oid, att.atttypmod) AS fulltype, - CASE WHEN t.typelem > 0 THEN t.typelem ELSE t.oid END as elemoid -FROM pg_catalog.pg_attribute att - JOIN pg_catalog.pg_type t ON t.oid=atttypid - JOIN pg_catalog.pg_namespace nsp ON t.typnamespace=nsp.oid - LEFT OUTER JOIN pg_catalog.pg_type b ON t.typelem=b.oid - LEFT OUTER JOIN pg_catalog.pg_collation c ON att.attcollation=c.oid - LEFT OUTER JOIN pg_catalog.pg_namespace nspc ON c.collnamespace=nspc.oid - WHERE att.attrelid = {{typrelid}}::oid - ORDER by attnum; -{% endif %} - -{# The SQL given below will fetch enum type#} -{% if typtype == 'e' %} -SELECT enumlabel -FROM pg_catalog.pg_enum - WHERE enumtypid={{tid}}::oid - ORDER by enumsortorder -{% endif %} - -{# The SQL given below will fetch range type#} -{% if typtype == 'r' %} -SELECT rngsubtype, st.typname, - rngcollation, mt.typname as rngmultirangetype, - CASE WHEN n.nspname IS NOT NULL THEN pg_catalog.concat(pg_catalog.quote_ident(n.nspname), '.', pg_catalog.quote_ident(col.collname)) ELSE col.collname END AS collname, - rngsubopc, opc.opcname, - rngcanonical, rngsubdiff as rngsubdiff_proc, - CASE WHEN length(ns.nspname::text) > 0 AND length(pgpr.proname::text) > 0 THEN - pg_catalog.concat(quote_ident(ns.nspname), '.', pg_catalog.quote_ident(pgpr.proname)) - ELSE '' END AS rngsubdiff -FROM pg_catalog.pg_range - LEFT JOIN pg_catalog.pg_type st ON st.oid=rngsubtype - LEFT JOIN pg_catalog.pg_type mt ON mt.oid=rngmultitypid - LEFT JOIN pg_catalog.pg_collation col ON col.oid=rngcollation - LEFT JOIN pg_catalog.pg_namespace n ON col.collnamespace=n.oid - LEFT JOIN pg_catalog.pg_opclass opc ON opc.oid=rngsubopc - LEFT JOIN pg_catalog.pg_proc pgpr ON pgpr.oid = rngsubdiff - LEFT JOIN pg_catalog.pg_namespace ns ON ns.oid=pgpr.pronamespace - WHERE rngtypid={{tid}}::oid; -{% endif %} - -{# The SQL given below will fetch enum type#} -{% if typtype == 'N' or typtype == 'V' %} -SELECT t.typname AS typname, - CASE WHEN t.typelem > 0 THEN t.typelem ELSE t.oid END AS elemoid, - t.typtypmod, - t.typtype, - t.typndims, - pg_catalog.format_type(e.oid,NULL) AS type, - pg_catalog.format_type(e.oid, t.typtypmod) AS fulltype, - nsp.nspname as typnspname, - e.typname as type, - (SELECT COUNT(1) FROM pg_catalog.pg_type t2 WHERE t2.typname = t.typname) > 1 AS isdup, - CASE WHEN t.typcollation != 0 THEN TRUE ELSE FALSE END AS is_collatable -FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON typnamespace=nsp.oid - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem -WHERE t.oid={{tid}}::oid; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/create.sql deleted file mode 100644 index 17c46f6eb19..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/create.sql +++ /dev/null @@ -1,96 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% 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) }}; -{% endif %} -{### Composite Type ###} -{% if data and data.typtype == 'c' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS -({{"\n\t"}}{% if data.composite %}{% for d in data.composite %}{% if loop.index != 1 %},{{"\n\t"}}{% endif %}{{ conn|qtIdent(d.member_name) }} {% if is_sql %}{{ d.fulltype }}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, d.cltype, d.tlength, d.precision, d.hasSqrBracket) }}{% endif %}{% if d.collation %} COLLATE {{d.collation}}{% endif %}{% endfor %}{% endif %}{{"\n"}}); -{% endif %} -{### Enum Type ###} -{% if data and data.typtype == 'e' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS ENUM - ({% for e in data.enum %}{% if loop.index != 1 %}, {% endif %}{{ e.label|qtLiteral(conn) }}{% endfor %}); -{% endif %} -{### Range Type ###} -{% if data and data.typtype == 'r' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS RANGE -( - {% if data.typname %}SUBTYPE={{ conn|qtTypeIdent(data.typname) }}{% endif %}{% if data.collname %}, - COLLATION = {{ data.collname }}{% endif %}{% if data.opcname %}, - SUBTYPE_OPCLASS = {{ data.opcname }}{% endif %}{% if data.rngcanonical %}, - CANONICAL = {{ data.rngcanonical }}{% endif %}{% if data.rngsubdiff %}, - SUBTYPE_DIFF = {{ data.rngsubdiff }}{% endif %}{% if data.rngmultirangetype %}, - MULTIRANGE_TYPE_NAME = {{ data.rngmultirangetype }}{% endif %} - -); -{% endif %} -{### External Type ###} -{% if data and data.typtype == 'b' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} - -( - {% if data.typinput %}INPUT = {{data.typinput}}{% endif %}{% if data.typoutput %}, - OUTPUT = {{ data.typoutput }}{% endif %}{% if data.typreceive %}, - RECEIVE = {{data.typreceive}}{% endif %}{% if data.typsend %}, - SEND = {{data.typsend}}{% endif %}{% if data.typmodin %}, - TYPMOD_IN = {{data.typmodin}}{% endif %}{% if data.typmodout %}, - TYPMOD_OUT = {{data.typmodout}}{% endif %}{% if data.typanalyze %}, - ANALYZE = {{data.typanalyze}}{% endif %}{% if data.typsubscript %}, - SUBSCRIPT = {{data.typsubscript}}{% endif %}{% if data.typlen %}, - INTERNALLENGTH = {{data.typlen}}{% endif %}{% if data.typbyval %}, - PASSEDBYVALUE{% endif %}{% if data.typalign %}, - ALIGNMENT = {{data.typalign}}{% endif %}{% if data.typstorage %}, - STORAGE = {{data.typstorage}}{% endif %}{% if data.typcategory %}, - CATEGORY = {{data.typcategory|qtLiteral(conn)}}{% endif %}{% if data.typispreferred %}, - PREFERRED = {{data.typispreferred}}{% endif %}{% if data.typdefault %}, - DEFAULT = {{data.typdefault|qtLiteral(conn)}}{% endif %}{% if data.element %}, - ELEMENT = {{data.element}}{% endif %}{% if data.typdelim %}, - DELIMITER = {{data.typdelim|qtLiteral(conn)}}{% endif %}{% if data.is_collatable %}, - COLLATABLE = {{data.is_collatable}}{% endif %} - -); -{% endif %} -{### Nested-table Type ###} -{% if data and data.typtype == 'N' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS TABLE OF - {% if is_sql %}{{ data.fulltype }}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.tlength, data.precision, data.hasSqrBracket) }}{% endif %}; -{% endif %} -{### VARRAY Type ###} -{% if data and data.typtype == 'V' %} -CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} AS VARRAY({{data.maxsize}}) OF - {% if is_sql %}{{ data.fulltype }}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.tlength, data.precision, data.hasSqrBracket) }}{% endif %}; -{% endif %} - -{### Type Owner ###} -{% if data and data.typeowner %} -ALTER TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} - - OWNER TO {{ conn|qtIdent(data.typeowner) }}; -{% endif %} -{### Type Comments ###} -{% if data and data.description %} - -COMMENT ON TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% else %}{{ conn|qtIdent(data.name) }}{% endif %} - - IS {{data.description|qtLiteral(conn)}}; -{% endif %} -{### ACL ###} -{% if data.typacl %} - -{% for priv in data.typacl %} -{{ PRIVILEGE.SET(conn, 'TYPE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{### Security Lables ###} -{% if data.seclabels %} - -{% for r in data.seclabels %} -{% if r.provider and r.label %} -{{ SECLABEL.SET(conn, 'TYPE', data.name, r.provider, r.label, data.schema) }} -{% endif %} -{% endfor %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/nodes.sql deleted file mode 100644 index 9469379f530..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/nodes.sql +++ /dev/null @@ -1,19 +0,0 @@ -SELECT t.oid, t.typname AS name, des.description, ra.rngmultitypid as rngmultirangetype -FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_range ra ON ra.rngtypid=t.oid - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = t.typnamespace - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_type'::regclass) -WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' AND t.typnamespace = {{scid}}::oid -{% if tid %} - AND t.oid = {{tid}}::oid -{% endif %} -{% if not show_system_objects %} - AND ct.oid is NULL -{% endif %} -{% if schema_diff %} - AND CASE WHEN (SELECT COUNT(*) FROM pg_catalog.pg_depend - WHERE objid = t.oid AND deptype = 'e') > 0 THEN FALSE ELSE TRUE END -{% endif %} -ORDER BY t.typname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql deleted file mode 100644 index 62d625c0017..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/properties.sql +++ /dev/null @@ -1,45 +0,0 @@ -SELECT t.oid, t.typname AS name, - (CASE WHEN CAST(coalesce(t.typcollation, '0') AS integer) = 100 THEN true ElSE false END) AS is_collatable, - t.typacl AS type_acl, - t.typnamespace, t.typowner, t.typlen, t.typbyval, t.typtype, - t.typcategory, t.typispreferred, t.typisdefined, t.typdelim, - t.typrelid, t.typelem, t.typarray, t.typalign, t.typstorage, - t.typnotnull, t.typbasetype, t.typtypmod, t.typndims, - t.typcollation, t.typdefaultbin, t.typdefault, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typinput::oid) AS typinput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typoutput::oid) AS typoutput, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typreceive::oid) AS typreceive, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typsend::oid) AS typsend, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typmodin::oid) AS typmodin, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typmodout::oid) AS typmodout, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typanalyze::oid) AS typanalyze, - (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid - WHERE pr.oid = t.typsubscript::oid) AS typsubscript, - pg_catalog.format_type(t.oid, null) AS alias, - pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, - description, ct.oid AS taboid, - nsp.nspname AS schema, - --MinimumVersion 9.1 START - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabel sl1 WHERE sl1.objoid=t.oid) AS seclabels, - -- END - (CASE WHEN (t.oid <= {{ datlastsysoid}}::oid OR ct.oid != 0) THEN true ElSE false END) AS is_sys_type -FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_type'::regclass) - LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = t.typnamespace -WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' AND t.typnamespace = {{scid}}::oid -{% if tid %} - AND t.oid = {{tid}}::oid -{% endif %} -{% if not show_system_objects %} - AND ct.oid is NULL -{% endif %} -ORDER BY t.typname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/update.sql deleted file mode 100644 index 008b3e8e1c1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/14_plus/update.sql +++ /dev/null @@ -1,183 +0,0 @@ -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% 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 %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - OWNER TO {{ conn|qtIdent(data.typeowner) }}; - -{% endif %} -{#======================================#} -{# Below will change objects comment #} -{% if data.description is defined and data.description != o_data.description %} -COMMENT ON TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - IS {{ data.description|qtLiteral(conn) }}; - -{% endif %} -{#======================================#} -{### The sql given below will update composite type ###} -{% if data.composite and data.composite|length > 0 %} -{% set composite = data.composite %} -{% if 'deleted' in composite and composite.deleted|length > 0 %} -{% for r in composite.deleted %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - DROP ATTRIBUTE {{conn|qtIdent(r.member_name)}}; -{% endfor %} -{% endif %} -{% if 'added' in composite and composite.added|length > 0 %} -{% for r in composite.added %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ADD ATTRIBUTE {{conn|qtIdent(r.member_name)}} {{ GET_TYPE.CREATE_TYPE_SQL(conn, r.cltype, r.tlength, r.precision, r.hasSqrBracket) }}{% if r.collation %} - COLLATE {{r.collation}}{% endif %}; -{% endfor %} -{% endif %} -{% if 'changed' in composite and composite.changed|length > 0 %} -{% for r in composite.changed %} -{% for o in o_data.composite %} -{##### Variables for the loop #####} -{% set member_name = o.member_name %} -{% set cltype = o.cltype %} -{% set tlength = o.tlength %} -{% set precision = o.precision %} -{% set hasSqrBracket = o.hasSqrBracket %} -{##### If member name changed #####} -{% if o.attnum == r.attnum %} -{% if r.member_name and o.member_name != r.member_name %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME ATTRIBUTE {{o.member_name}} TO {{r.member_name}}; -{% set member_name = r.member_name %} -{% endif %} -{##### If type changed #####} -{% if r.cltype and cltype != r.cltype %} -{% set cltype = r.cltype %} -{% set hasSqrBracket = r.hasSqrBracket %} -{##### If length is not allowed on type #####} -{% if not r.is_tlength %} -{% set tlength = 0 %} -{% set precision = 0 %} -{% endif %} -{% endif %} -{##### If length changed #####} -{% if r.tlength and tlength != r.tlength %} -{% set tlength = r.tlength %} -{% endif %} -{##### If precision changed #####} -{% if tlength and r.precision and precision != r.precision %} -{% set precision = r.precision %} -{% endif %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ALTER ATTRIBUTE {{conn|qtIdent(member_name)}} SET DATA TYPE {{ GET_TYPE.CREATE_TYPE_SQL(conn, cltype, tlength, precision, hasSqrBracket) }}{% if r.collation %} - COLLATE {{r.collation}}{% endif %}; -{% endif%} -{% endfor %} -{% endfor %} -{% endif %} -{% endif %} -{#======================================#} -{### The sql given below will update enum type ###} -{% if data.enum and data.enum|length > 0 %} -{% set enum = data.enum %} -{% set o_enum_len = o_data.enum|length %} -{# We need actual list index from length #} -{% set o_enum_len = o_enum_len - 1 %} -{% if 'added' in enum and enum.added|length > 0 %} -{% for r in enum.added %} -{% set c_idx = loop.index %} -{% if c_idx == 1 %} -{# if first new element then add it after old data enum list#} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ADD VALUE {{r.label|qtLiteral(conn)}} {% if o_enum_len > 0 %}AFTER {{o_data.enum[o_enum_len].label|qtLiteral(conn) }}{% endif %}; -{% else %} -{# if first new element then add it after new data enum list#} -{% set p_idx = loop.index - 2 %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - ADD VALUE {{r.label|qtLiteral(conn)}} AFTER {{enum.added[p_idx].label|qtLiteral(conn)}}; -{% endif %} -{% endfor %} -{% endif %} - -{% if 'changed' in enum and enum.changed|length > 0 %} -{% for r in enum.changed %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME VALUE {{r.old_label|qtLiteral(conn)}} TO {{r.label|qtLiteral(conn)}}; -{% endfor %} -{% endif %} - -{% endif %} -{#======================================#} -{### The sql given below will update External type ###} -{% if (data.typreceive is defined and data.typreceive != o_data.typreceive) or (data.typsend is defined and data.typsend != o_data.typsend) or (data.typmodin is defined and data.typmodin != o_data.typmodin) or (data.typmodout is defined and data.typmodout != o_data.typmodout) or (data.typanalyze is defined and data.typanalyze != o_data.typanalyze) or (data.typsubscript is defined and data.typsubscript != o_data.typsubscript) or (data.typstorage is defined and data.typstorage != o_data.typstorage)%} -{% set ns = namespace(add_comma=false) %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} SET ( - {% if data.typreceive is defined %}RECEIVE = {{data.typreceive}}{% set ns.add_comma = true%}{% endif %}{% if data.typsend is defined %}{% if ns.add_comma %}, - {% endif %}SEND = {{data.typsend}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodin is defined %}{% if ns.add_comma %}, - {% endif %}TYPMOD_IN = {{data.typmodin}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodout is defined %}{% if ns.add_comma %}, - {% endif %}TYPMOD_OUT = {{data.typmodout}}{% set ns.add_comma = true%}{% endif %}{% if data.typanalyze is defined %}{% if ns.add_comma %}, - {% endif %}ANALYZE = {{data.typanalyze}}{% set ns.add_comma = true%}{% endif %}{% if data.typsubscript is defined %}{% if ns.add_comma %}, - {% endif %}SUBSCRIPT = {{data.typsubscript}}{% set ns.add_comma = true%}{% endif %}{% if data.typstorage is defined %}{% if ns.add_comma %}, - {% endif %}STORAGE = {{data.typstorage}}{% endif %} - -); -{% endif %} -{#======================================#} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'TYPE', o_data.name, r.provider, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'TYPE', o_data.name, r.provider, r.label, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'TYPE', o_data.name, r.provider, r.label, o_data.schema) }} -{% endfor %} -{% endif %} - -{% endif %} -{#======================================#} -{# Change the privileges #} -{% if data.typacl and data.typacl|length > 0 %} -{% if 'deleted' in data.typacl %} -{% for priv in data.typacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TYPE', priv.grantee, o_data.name, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.typacl %} -{% for priv in data.typacl.changed %} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TYPE', priv.old_grantee, o_data.name, o_data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TYPE', priv.grantee, o_data.name, o_data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TYPE', priv.grantee, o_data.name, priv.without_grant, priv.with_grant, o_data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in data.typacl %} -{% for priv in data.typacl.added %} -{{ PRIVILEGE.SET(conn, 'TYPE', priv.grantee, o_data.name, priv.without_grant, priv.with_grant, o_data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{#======================================#} -{# Below will change object name #} -{% if data.name and data.name != o_data.name %} -ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{#======================================#} -{# Below will change the schema for object #} -{# with extra if condition we will also make sure that object has correct name #} -{% if data.schema and data.schema != o_data.schema %} -ALTER TYPE {% if data.name and data.name != o_data.name %}{{ conn|qtIdent(o_data.schema, data.name) }} -{% else %}{{ conn|qtIdent(o_data.schema, o_data.name) }} -{% endif %} - SET SCHEMA {{ conn|qtIdent(data.schema) }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/additional_properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/additional_properties.sql index 683cca92aa3..b186b762f0c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/additional_properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/additional_properties.sql @@ -26,7 +26,7 @@ FROM pg_catalog.pg_enum {# The SQL given below will fetch range type#} {% if typtype == 'r' %} SELECT rngsubtype, st.typname, - rngcollation, + rngcollation, mt.typname as rngmultirangetype, CASE WHEN n.nspname IS NOT NULL THEN pg_catalog.concat(pg_catalog.quote_ident(n.nspname), '.', pg_catalog.quote_ident(col.collname)) ELSE col.collname END AS collname, rngsubopc, opc.opcname, rngcanonical, rngsubdiff as rngsubdiff_proc, @@ -35,6 +35,7 @@ SELECT rngsubtype, st.typname, ELSE '' END AS rngsubdiff FROM pg_catalog.pg_range LEFT JOIN pg_catalog.pg_type st ON st.oid=rngsubtype + LEFT JOIN pg_catalog.pg_type mt ON mt.oid=rngmultitypid LEFT JOIN pg_catalog.pg_collation col ON col.oid=rngcollation LEFT JOIN pg_catalog.pg_namespace n ON col.collnamespace=n.oid LEFT JOIN pg_catalog.pg_opclass opc ON opc.oid=rngsubopc diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/create.sql index a2c5cec997c..17c46f6eb19 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/create.sql @@ -23,7 +23,8 @@ CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% els COLLATION = {{ data.collname }}{% endif %}{% if data.opcname %}, SUBTYPE_OPCLASS = {{ data.opcname }}{% endif %}{% if data.rngcanonical %}, CANONICAL = {{ data.rngcanonical }}{% endif %}{% if data.rngsubdiff %}, - SUBTYPE_DIFF = {{ data.rngsubdiff }}{% endif %} + SUBTYPE_DIFF = {{ data.rngsubdiff }}{% endif %}{% if data.rngmultirangetype %}, + MULTIRANGE_TYPE_NAME = {{ data.rngmultirangetype }}{% endif %} ); {% endif %} @@ -38,7 +39,8 @@ CREATE TYPE {% if data.schema %}{{ conn|qtIdent(data.schema, data.name) }}{% els SEND = {{data.typsend}}{% endif %}{% if data.typmodin %}, TYPMOD_IN = {{data.typmodin}}{% endif %}{% if data.typmodout %}, TYPMOD_OUT = {{data.typmodout}}{% endif %}{% if data.typanalyze %}, - ANALYZE = {{data.typanalyze}}{% endif %}{% if data.typlen %}, + ANALYZE = {{data.typanalyze}}{% endif %}{% if data.typsubscript %}, + SUBSCRIPT = {{data.typsubscript}}{% endif %}{% if data.typlen %}, INTERNALLENGTH = {{data.typlen}}{% endif %}{% if data.typbyval %}, PASSEDBYVALUE{% endif %}{% if data.typalign %}, ALIGNMENT = {{data.typalign}}{% endif %}{% if data.typstorage %}, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/nodes.sql index 8032959e111..9469379f530 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/nodes.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/nodes.sql @@ -1,6 +1,7 @@ -SELECT t.oid, t.typname AS name, des.description +SELECT t.oid, t.typname AS name, des.description, ra.rngmultitypid as rngmultirangetype FROM pg_catalog.pg_type t LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem + LEFT OUTER JOIN pg_catalog.pg_range ra ON ra.rngtypid=t.oid LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' LEFT OUTER JOIN pg_catalog.pg_namespace nsp ON nsp.oid = t.typnamespace LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=t.oid AND des.classoid='pg_type'::regclass) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql index 400c742140a..62d625c0017 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/properties.sql @@ -20,6 +20,8 @@ SELECT t.oid, t.typname AS name, WHERE pr.oid = t.typmodout::oid) AS typmodout, (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid WHERE pr.oid = t.typanalyze::oid) AS typanalyze, + (SELECT pg_catalog.concat(nspname, '.', proname,'') FROM pg_catalog.pg_proc pr JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace = nsp.oid + WHERE pr.oid = t.typsubscript::oid) AS typsubscript, pg_catalog.format_type(t.oid, null) AS alias, pg_catalog.pg_get_userbyid(t.typowner) as typeowner, e.typname as element, description, ct.oid AS taboid, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/update.sql index 20200cc76c2..008b3e8e1c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/ppas/sql/default/update.sql @@ -107,14 +107,15 @@ ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} {% endif %} {#======================================#} {### The sql given below will update External type ###} -{% if (data.typreceive is defined and data.typreceive != o_data.typreceive) or (data.typsend is defined and data.typsend != o_data.typsend) or (data.typmodin is defined and data.typmodin != o_data.typmodin) or (data.typmodout is defined and data.typmodout != o_data.typmodout) or (data.typanalyze is defined and data.typanalyze != o_data.typanalyze) or (data.typstorage is defined and data.typstorage != o_data.typstorage)%} +{% if (data.typreceive is defined and data.typreceive != o_data.typreceive) or (data.typsend is defined and data.typsend != o_data.typsend) or (data.typmodin is defined and data.typmodin != o_data.typmodin) or (data.typmodout is defined and data.typmodout != o_data.typmodout) or (data.typanalyze is defined and data.typanalyze != o_data.typanalyze) or (data.typsubscript is defined and data.typsubscript != o_data.typsubscript) or (data.typstorage is defined and data.typstorage != o_data.typstorage)%} {% set ns = namespace(add_comma=false) %} ALTER TYPE {{ conn|qtIdent(o_data.schema, o_data.name) }} SET ( {% if data.typreceive is defined %}RECEIVE = {{data.typreceive}}{% set ns.add_comma = true%}{% endif %}{% if data.typsend is defined %}{% if ns.add_comma %}, {% endif %}SEND = {{data.typsend}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodin is defined %}{% if ns.add_comma %}, {% endif %}TYPMOD_IN = {{data.typmodin}}{% set ns.add_comma = true%}{% endif %}{% if data.typmodout is defined %}{% if ns.add_comma %}, {% endif %}TYPMOD_OUT = {{data.typmodout}}{% set ns.add_comma = true%}{% endif %}{% if data.typanalyze is defined %}{% if ns.add_comma %}, - {% endif %}ANALYZE = {{data.typanalyze}}{% set ns.add_comma = true%}{% endif %}{% if data.typstorage is defined %}{% if ns.add_comma %}, + {% endif %}ANALYZE = {{data.typanalyze}}{% set ns.add_comma = true%}{% endif %}{% if data.typsubscript is defined %}{% if ns.add_comma %}, + {% endif %}SUBSCRIPT = {{data.typsubscript}}{% set ns.add_comma = true%}{% endif %}{% if data.typstorage is defined %}{% if ns.add_comma %}, {% endif %}STORAGE = {{data.typstorage}}{% endif %} ); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_acl_grantee_change.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_acl_grantee_change.sql deleted file mode 100644 index 91520ae0d83..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_acl_grantee_change.sql +++ /dev/null @@ -1,18 +0,0 @@ --- Type: range_type_$%{}[]()&*^!@"'`\/# - --- DROP TYPE IF EXISTS public."range_type_$%{}[]()&*^!@""'`\/#"; - -CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops, - MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# -); - -ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO ; - -COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - IS 'this is test'; - -GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_range_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_range_type_acl_description.sql deleted file mode 100644 index 094785d2f2a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/alter_range_type_acl_description.sql +++ /dev/null @@ -1,20 +0,0 @@ --- Type: range_type_$%{}[]()&*^!@"'`\/# - --- DROP TYPE IF EXISTS public."range_type_$%{}[]()&*^!@""'`\/#"; - -CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops, - MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# -); - -ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO ; - -COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - IS 'this is test'; - -GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_range_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_range_type.sql deleted file mode 100644 index ac57c8cbbbd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_range_type.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Type: range_type_$%{}[]()&*^!@"'`\/# - --- DROP TYPE IF EXISTS public."range_type_$%{}[]()&*^!@""'`\/#"; - -CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops, - MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# -); - -ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/tests.json deleted file mode 100644 index 6a1fb1ca811..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/tests.json +++ /dev/null @@ -1,439 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create ENUM type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "enum_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type": false, - "typtype": "e", - "schema": "public", - "composite": [], - "enum": [ - { - "label": "a" - }, - { - "label": "b" - }, - { - "label": "c" - } - ], - "typacl": [], - "seclabels": [], - "description": "" - }, - "expected_sql_file": "create_enum_type.sql", - "expected_msql_file": "create_enum_type.msql" - }, - { - "type": "alter", - "name": "alter ENUM type and add new label", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "enum": { - "added": [ - { - "label": "d" - } - ] - } - }, - "expected_sql_file": "alter_enum_type_label.sql", - "expected_msql_file": "alter_enum_type_label.msql" - }, - { - "type": "alter", - "name": "alter ENUM type and add ACL, description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description": "this is test", - "typacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_enum_type_acl_description.sql", - "expected_msql_file": "alter_enum_type_acl_description.msql" - }, - { - "type": "alter", - "name": "alter ENUM type and rename ENUM", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "enum": { - "changed": [ - { - "label": "a_new", - "old_label": "a" - }, - { - "label": "d_new", - "old_label": "d" - } - ] - } - }, - "expected_sql_file": "alter_enum_type_rename_enum.sql", - "expected_msql_file": "alter_enum_type_rename_enum.msql" - }, - { - "type": "delete", - "name": "Drop ENUM type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - { - "type": "create", - "name": "Create Composite type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "composite_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type": false, - "typtype": "c", - "schema": "public", - "composite": [ - { - "member_name": "mname1", - "type": "bigint", - "is_tlength": false, - "is_precision": false - }, - { - "member_name": "mname2", - "type": "character varying", - "tlength": 50, - "is_tlength": true, - "is_precision": false, - "collation": "pg_catalog.\"C\"", - "min_val": 1, - "max_val": 2147483647, - "collspcname": "" - }, - { - "member_name": "mname3", - "type": "text[]", - "is_tlength": false, - "is_precision": false, - "collation": "pg_catalog.\"C\"", - "collspcname": "" - } - ], - "typacl": [], - "seclabels": [], - "description": "" - }, - "expected_sql_file": "create_composite_type.sql", - "expected_msql_file": "create_composite_type.msql" - }, - { - "type": "alter", - "name": "alter Composite type and add new label", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "composite": { - "added": [ - { - "member_name": "mname4", - "type": "bigint", - "is_tlength": false, - "is_precision": false - } - ] - } - }, - "expected_sql_file": "alter_composite_type_add_member.sql", - "expected_msql_file": "alter_composite_type_add_member.msql" - }, - { - "type": "alter", - "name": "alter Composite type and delete label", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "composite": { - "deleted": [ - { - "attnum": 1, - "member_name": "mname1", - "type": "bigint", - "tlength": null, - "is_tlength": false, - "precision": null, - "is_precision": false, - "collation": "", - "cltype": "bigint", - "hasSqrBracket": false, - "fulltype": "bigint" - } - ] - } - }, - "expected_sql_file": "alter_composite_type_remove_member.sql", - "expected_msql_file": "alter_composite_type_remove_member.msql" - }, - { - "type": "alter", - "name": "alter Composite type and add ACL, description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description": "this is test", - "typacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_composite_type_acl_description.sql", - "expected_msql_file": "alter_composite_type_acl_description.msql" - }, - { - "type": "delete", - "name": "Drop Composite type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - { - "type": "create", - "name": "Create Composite type - one field", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "data": { - "name": "composite_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type": false, - "typtype": "c", - "schema": "public", - "composite": [ - { - "member_name": "mname1", - "type": "bigint", - "is_tlength": false, - "is_precision": false - } - ], - "typacl": [], - "seclabels": [], - "description": "" - }, - "expected_sql_file": "create_composite_type_one_field.sql" - }, - { - "type": "delete", - "name": "Drop Composite type - one field", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - { - "type": "create", - "name": "Create SHELL type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "shell_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type": false, - "typtype": "p", - "schema": "public", - "composite": [], - "enum": [], - "typacl": [], - "seclabels": [] - }, - "expected_sql_file": "create_shell_type.sql", - "expected_msql_file": "create_shell_type.msql" - }, - { - "type": "alter", - "name": "alter SHELL type and add description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description": "this is test" - }, - "expected_sql_file": "alter_shell_type_acl_description.sql", - "expected_msql_file": "alter_shell_type_acl_description.msql" - }, - { - "type": "delete", - "name": "Drop SHELL type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - { - "type": "create", - "name": "Create RANGE type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "range_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type": false, - "typtype": "r", - "schema": "public", - "composite": [], - "enum": [], - "typacl": [], - "seclabels": [], - "typname": "bool" - }, - "expected_sql_file": "create_range_type.sql", - "expected_msql_file": "create_range_type.msql" - }, - { - "type": "alter", - "name": "alter RANGE type and add ACL, description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description": "this is test", - "typacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_range_type_acl_description.sql", - "expected_msql_file": "alter_range_type_acl_description.msql" - }, - { - "type": "alter", - "name": "alter ACL (Remove privilege)", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "typacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "alter ACL (change grantee)", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "typacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_acl_grantee_change.sql", - "expected_msql_file": "alter_acl_grantee_change_msql.sql" - }, - { - "type": "delete", - "name": "Drop RANGE type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - { - "type": "create", - "name": "Create Multi RANGE type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "range_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type": false, - "typtype": "r", - "schema": "public", - "composite": [], - "enum": [], - "typacl": [], - "seclabels": [], - "typname": "bool", - "rngmultirangetype": "multirange_type" - }, - "expected_sql_file": "create_multi_range_type.sql", - "expected_msql_file": "create_multi_range_type.msql" - }, - { - "type": "delete", - "name": "Drop RANGE type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_acl_grantee_change.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_acl_grantee_change.sql index 82f806c8511..91520ae0d83 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_acl_grantee_change.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_acl_grantee_change.sql @@ -5,7 +5,8 @@ CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE ( SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops + SUBTYPE_OPCLASS = bool_ops, + MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# ); ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_range_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_range_type_acl_description.sql index 1a0b6243644..094785d2f2a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_range_type_acl_description.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/alter_range_type_acl_description.sql @@ -5,7 +5,8 @@ CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE ( SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops + SUBTYPE_OPCLASS = bool_ops, + MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# ); ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_multi_range_type.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_multi_range_type.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_multi_range_type.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_multi_range_type.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_multi_range_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_multi_range_type.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/14_plus/create_multi_range_type.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_multi_range_type.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_range_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_range_type.sql index e001dd4cb6a..ac57c8cbbbd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_range_type.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/create_range_type.sql @@ -5,7 +5,8 @@ CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE ( SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops + SUBTYPE_OPCLASS = bool_ops, + MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# ); ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/tests.json index 40d5e1626dc..6a1fb1ca811 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/tests.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/pg/default/tests.json @@ -400,6 +400,34 @@ "expected_sql_file": "alter_acl_grantee_change.sql", "expected_msql_file": "alter_acl_grantee_change_msql.sql" }, + { + "type": "delete", + "name": "Drop RANGE type", + "endpoint": "NODE-type.obj_id", + "sql_endpoint": "NODE-type.sql_id", + "data": {} + }, + { + "type": "create", + "name": "Create Multi RANGE type", + "endpoint": "NODE-type.obj", + "sql_endpoint": "NODE-type.sql_id", + "msql_endpoint": "NODE-type.msql", + "data": { + "name": "range_type_$%{}[]()&*^!@\"'`\\/#", + "is_sys_type": false, + "typtype": "r", + "schema": "public", + "composite": [], + "enum": [], + "typacl": [], + "seclabels": [], + "typname": "bool", + "rngmultirangetype": "multirange_type" + }, + "expected_sql_file": "create_multi_range_type.sql", + "expected_msql_file": "create_multi_range_type.msql" + }, { "type": "delete", "name": "Drop RANGE type", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_acl_grantee_change.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_acl_grantee_change.sql deleted file mode 100644 index 91520ae0d83..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_acl_grantee_change.sql +++ /dev/null @@ -1,18 +0,0 @@ --- Type: range_type_$%{}[]()&*^!@"'`\/# - --- DROP TYPE IF EXISTS public."range_type_$%{}[]()&*^!@""'`\/#"; - -CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops, - MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# -); - -ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO ; - -COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - IS 'this is test'; - -GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_range_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_range_type_acl_description.sql deleted file mode 100644 index 094785d2f2a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/alter_range_type_acl_description.sql +++ /dev/null @@ -1,20 +0,0 @@ --- Type: range_type_$%{}[]()&*^!@"'`\/# - --- DROP TYPE IF EXISTS public."range_type_$%{}[]()&*^!@""'`\/#"; - -CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops, - MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# -); - -ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO ; - -COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - IS 'this is test'; - -GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO PUBLIC; - -GRANT USAGE ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_range_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_range_type.sql deleted file mode 100644 index ac57c8cbbbd..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_range_type.sql +++ /dev/null @@ -1,13 +0,0 @@ --- Type: range_type_$%{}[]()&*^!@"'`\/# - --- DROP TYPE IF EXISTS public."range_type_$%{}[]()&*^!@""'`\/#"; - -CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops, - MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# -); - -ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO ; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/tests.json deleted file mode 100644 index 3fb712c93ad..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/tests.json +++ /dev/null @@ -1,324 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create ENUM type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "enum_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"e", - "schema":"public", - "composite":[], - "enum":[{"label":"a"},{"label":"b"},{"label":"c"}], - "typacl":[], - "seclabels":[], - "description":"" - }, - "expected_sql_file": "create_enum_type.sql", - "expected_msql_file": "create_enum_type.msql" - }, - { - "type": "alter", - "name": "alter ENUM type and add new label", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "enum": {"added": [{"label": "d"}]} - }, - "expected_sql_file": "alter_enum_type_label.sql", - "expected_msql_file": "alter_enum_type_label.msql" - }, - { - "type": "alter", - "name": "alter ENUM type and add ACL, description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description":"this is test", - "typacl": {"added": [{"grantee":"PUBLIC","grantor":"enterprisedb","privileges":[{"privilege_type":"U","privilege":true,"with_grant":false}]}]} - }, - "expected_sql_file": "alter_enum_type_acl_description.sql", - "expected_msql_file": "alter_enum_type_acl_description.msql" - }, - { - "type": "alter", - "name": "alter ENUM type and rename ENUM", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "enum": {"changed": [{"label": "a_new", "old_label": "a"}, {"label": "d_new", "old_label": "d"}]} - }, - "expected_sql_file": "alter_enum_type_rename_enum.sql", - "expected_msql_file": "alter_enum_type_rename_enum.msql" - }, - { - "type": "delete", - "name": "Drop ENUM type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - - - { - "type": "create", - "name": "Create Composite type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "composite_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"c", - "schema":"public", - "composite":[ - {"member_name":"mname1","type":"bigint","is_tlength":false,"is_precision":false}, - {"member_name":"mname2","type":"character varying","tlength":50,"is_tlength":true,"is_precision":false,"collation":"pg_catalog.\"C\"","min_val":1,"max_val":2147483647,"collspcname":""}, - {"member_name":"mname3","type":"text[]","is_tlength":false,"is_precision":false,"collation":"pg_catalog.\"C\"","collspcname":""} - ], - "typacl":[], - "seclabels":[], - "description":"" - }, - "expected_sql_file": "create_composite_type.sql", - "expected_msql_file": "create_composite_type.msql" - }, - { - "type": "alter", - "name": "alter Composite type and add new label", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "composite": {"added": [{"member_name":"mname4","type":"bigint","is_tlength":false,"is_precision":false}]} - }, - "expected_sql_file": "alter_composite_type_add_member.sql", - "expected_msql_file": "alter_composite_type_add_member.msql" - }, - { - "type": "alter", - "name": "alter Composite type and delete label", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "composite": {"deleted":[{"attnum":1,"member_name":"mname1","type":"bigint","tlength":null,"is_tlength":false,"precision":null,"is_precision":false,"collation":"","cltype":"bigint","hasSqrBracket":false,"fulltype":"bigint"}]} - }, - "expected_sql_file": "alter_composite_type_remove_member.sql", - "expected_msql_file": "alter_composite_type_remove_member.msql" - }, - { - "type": "alter", - "name": "alter Composite type and add ACL, description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description":"this is test", - "typacl": {"added": [{"grantee":"PUBLIC","grantor":"enterprisedb","privileges":[{"privilege_type":"U","privilege":true,"with_grant":false}]}]} - }, - "expected_sql_file": "alter_composite_type_acl_description.sql", - "expected_msql_file": "alter_composite_type_acl_description.msql" - }, - { - "type": "delete", - "name": "Drop Composite type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - - { - "type": "create", - "name": "Create Composite type - one field", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "data": { - "name": "composite_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"c", - "schema":"public", - "composite":[ - {"member_name":"mname1","type":"bigint","is_tlength":false,"is_precision":false} - ], - "typacl":[], - "seclabels":[], - "description":"" - }, - "expected_sql_file": "create_composite_type_one_field.sql" - }, - { - "type": "delete", - "name": "Drop Composite type - one field", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - - { - "type": "create", - "name": "Create SHELL type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "shell_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"p", - "schema":"public", - "composite":[], - "enum":[], - "typacl":[], - "seclabels":[] - }, - "expected_sql_file": "create_shell_type.sql", - "expected_msql_file": "create_shell_type.msql" - }, - { - "type": "alter", - "name": "alter SHELL type and add description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description":"this is test" - }, - "expected_sql_file": "alter_shell_type_acl_description.sql", - "expected_msql_file": "alter_shell_type_acl_description.msql" - }, - { - "type": "delete", - "name": "Drop SHELL type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - - - { - "type": "create", - "name": "Create RANGE type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "range_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"r", - "schema":"public", - "composite":[], - "enum":[], - "typacl":[], - "seclabels":[], - "typname":"bool" - }, - "expected_sql_file": "create_range_type.sql", - "expected_msql_file": "create_range_type.msql" - }, - { - "type": "alter", - "name": "alter RANGE type and add ACL, description", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "description":"this is test", - "typacl": {"added": [{"grantee":"PUBLIC","grantor":"enterprisedb","privileges":[{"privilege_type":"U","privilege":true,"with_grant":false}]}]} - }, - "expected_sql_file": "alter_range_type_acl_description.sql", - "expected_msql_file": "alter_range_type_acl_description.msql" - }, - { - "type": "alter", - "name": "alter ACL (Remove privilege)", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "typacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "alter ACL (change grantee)", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql_id", - "data": { - "typacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "U", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_acl_grantee_change.sql", - "expected_msql_file": "alter_acl_grantee_change_msql.sql" - }, - { - "type": "delete", - "name": "Drop RANGE type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - }, - { - "type": "create", - "name": "Create Multi RANGE type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "range_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"r", - "schema":"public", - "composite":[], - "enum":[], - "typacl":[], - "seclabels":[], - "typname":"bool", - "rngmultirangetype": "multirange_type" - }, - "expected_sql_file": "create_multi_range_type.sql", - "expected_msql_file": "create_multi_range_type.msql" - }, - { - "type": "delete", - "name": "Drop RANGE type", - "endpoint": "NODE-type.obj_id", - "sql_endpoint": "NODE-type.sql_id", - "data": {} - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_acl_grantee_change.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_acl_grantee_change.sql index 49a7706c590..91520ae0d83 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_acl_grantee_change.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_acl_grantee_change.sql @@ -5,11 +5,12 @@ CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE ( SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops + SUBTYPE_OPCLASS = bool_ops, + MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# ); ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" - OWNER TO enterprisedb; + OWNER TO ; COMMENT ON TYPE public."range_type_$%{}[]()&*^!@""'`\/#" IS 'this is test'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_range_type_acl_description.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_range_type_acl_description.sql index 1a0b6243644..094785d2f2a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_range_type_acl_description.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/alter_range_type_acl_description.sql @@ -5,7 +5,8 @@ CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE ( SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops + SUBTYPE_OPCLASS = bool_ops, + MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# ); ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_multi_range_type.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_multi_range_type.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_multi_range_type.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_multi_range_type.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_multi_range_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_multi_range_type.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/14_plus/create_multi_range_type.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_multi_range_type.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_range_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_range_type.sql index e001dd4cb6a..ac57c8cbbbd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_range_type.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/create_range_type.sql @@ -5,7 +5,8 @@ CREATE TYPE public."range_type_$%{}[]()&*^!@""'`\/#" AS RANGE ( SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops + SUBTYPE_OPCLASS = bool_ops, + MULTIRANGE_TYPE_NAME = multirange_type_$%{}[]()&*^!@"'`\/# ); ALTER TYPE public."range_type_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/tests.json index 2aa4cbd3409..3fb712c93ad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/tests.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/tests/ppas/default/tests.json @@ -65,45 +65,7 @@ "data": {} }, - { - "type": "create", - "name": "Create Nested Table type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "nested_table_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"N", - "schema":"public", - "type": "numeric", - "tlength": 2, - "precision": 1, - "typacl":[], - "seclabels":[], - "description":"" - }, - "expected_sql_file": "create_nested_table_type.sql" - }, - { - "type": "create", - "name": "Create Varray type", - "endpoint": "NODE-type.obj", - "sql_endpoint": "NODE-type.sql_id", - "msql_endpoint": "NODE-type.msql", - "data": { - "name": "varray_type_$%{}[]()&*^!@\"'`\\/#", - "is_sys_type":false, - "typtype":"V", - "schema":"public", - "type": "integer", - "maxsize": 10, - "typacl":[], - "seclabels":[], - "description":"" - }, - "expected_sql_file": "create_varray_type.sql" - }, + { "type": "create", "name": "Create Composite type", @@ -323,6 +285,34 @@ "expected_sql_file": "alter_acl_grantee_change.sql", "expected_msql_file": "alter_acl_grantee_change_msql.sql" }, + { + "type": "delete", + "name": "Drop RANGE type", + "endpoint": "NODE-type.obj_id", + "sql_endpoint": "NODE-type.sql_id", + "data": {} + }, + { + "type": "create", + "name": "Create Multi RANGE type", + "endpoint": "NODE-type.obj", + "sql_endpoint": "NODE-type.sql_id", + "msql_endpoint": "NODE-type.msql", + "data": { + "name": "range_type_$%{}[]()&*^!@\"'`\\/#", + "is_sys_type":false, + "typtype":"r", + "schema":"public", + "composite":[], + "enum":[], + "typacl":[], + "seclabels":[], + "typname":"bool", + "rngmultirangetype": "multirange_type" + }, + "expected_sql_file": "create_multi_range_type.sql", + "expected_msql_file": "create_multi_range_type.msql" + }, { "type": "delete", "name": "Drop RANGE type", diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/create.sql deleted file mode 100644 index 99c5ddd52d2..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/create.sql +++ /dev/null @@ -1,52 +0,0 @@ -{# ===================== Create new view ===================== #} -{% if display_comments %} --- View: {{ data.schema }}.{{ data.name }} - --- DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(data.schema, data.name) }}; - -{% endif %} -{% if data.name and data.schema and data.definition %} -CREATE MATERIALIZED VIEW{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} -{% if data.default_amname and data.default_amname != data.amname %} -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} -USING {{data.amname}} -{% endif %} -{% if(data.fillfactor or data.toast_tuple_target or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') or data['vacuum_data']|length > 0) %} -{% set ns = namespace(add_comma=false) %} -WITH ( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% set ns.add_comma = true%}{% endif %}{% if data.toast_tuple_target %} -{% if ns.add_comma %}, -{% endif %} TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %} -{% for field in data['vacuum_data'] %} -{% if field.value is defined and field.value != '' and field.value != none %} -{% if ns.add_comma %}, -{% endif %} {{ field.name }} = {{ field.value|lower }}{% set ns.add_comma = true%}{% endif %}{% endfor %} -{{ '\n' }}) -{% endif %} -{% if data.spcname %}TABLESPACE {{ data.spcname }} -{% endif %}AS -{{ data.definition.rstrip(';') }} -{% if data.with_data %} -WITH DATA; -{% else %} -WITH NO DATA; -{% endif %} -{% if data.owner %} - -ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; -{% endif %} -{% if data.comment %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/properties.sql deleted file mode 100644 index 6c87c88b6c7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/properties.sql +++ /dev/null @@ -1,114 +0,0 @@ -{# ========================== Fetch Materialized View Properties ========================= #} -{% if (vid and datlastsysoid) or scid %} -SELECT - c.oid, - c.xmin, - c.relname AS name, - c.reltablespace AS spcoid, - c.relispopulated AS with_data, - CASE WHEN length(spcname::text) > 0 THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st - WHERE st.name = 'default_table_access_method') as default_amname, - c.relacl, - nsp.nspname as schema, - pg_catalog.pg_get_userbyid(c.relowner) AS owner, - description AS comment, - pg_catalog.pg_get_viewdef(c.oid, true) AS definition, - {# ============= Checks if it is system view ================ #} - {% if vid and datlastsysoid %} - CASE WHEN {{vid}} <= {{datlastsysoid}} THEN True ELSE False END AS system_view, - {% endif %} - pg_catalog.array_to_string(c.relacl::text[], ', ') AS acl, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=c.oid AND sl1.objsubid=0) AS seclabels, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'fillfactor=([0-9]*)') AS fillfactor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'toast_tuple_target=([0-9]*)') AS toast_tuple_target, - (substring(pg_catalog.array_to_string(c.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, am.amname, - (CASE WHEN c.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable -FROM - pg_catalog.pg_class c -LEFT OUTER JOIN pg_catalog.pg_namespace nsp on nsp.oid = c.relnamespace -LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=c.reltablespace -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid and des.objsubid=0 AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = c.reltoastrelid -LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = c.relam - WHERE ((c.relhasrules AND (EXISTS ( - SELECT - r.rulename - FROM - pg_catalog.pg_rewrite r - WHERE - ((r.ev_class = c.oid) - AND (pg_catalog.bpchar(r.ev_type) = '1'::bpchar)) ))) - AND (c.relkind = 'm'::char) - ) -{% if (vid and datlastsysoid) %} - AND c.oid = {{vid}}::oid -{% elif scid %} - AND c.relnamespace = {{scid}}::oid -ORDER BY - c.relname -{% endif %} - -{% elif type == 'roles' %} -SELECT - pr.rolname -FROM - pg_catalog.pg_roles pr -WHERE - pr.rolcanlogin -ORDER BY - pr.rolname - -{% elif type == 'schemas' %} -SELECT - nsp.nspname -FROM - pg_catalog.pg_namespace nsp -WHERE - (nsp.nspname NOT LIKE E'pg\\_%' - AND nsp.nspname != 'information_schema') -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/update.sql deleted file mode 100644 index e17a64c83a7..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/update.sql +++ /dev/null @@ -1,226 +0,0 @@ -{# ===================== Update View ===================#} -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{%- if data -%} -{% set view_name = data.name if data.name else o_data.name %} -{% set view_schema = data.schema if data.schema else o_data.schema %} -{% set def = data.definition.rstrip(';') if data.definition %} -{# ===== Rename mat view ===== #} -{% if data.name and data.name != o_data.name %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{# ===== Alter schema view ===== #} -{% if data.schema and data.schema != o_data.schema %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, view_name ) }} - SET SCHEMA {{ conn|qtIdent(data.schema) }}; - -{% endif %} -{# ===== Alter Table owner ===== #} -{% if data.owner and data.owner != o_data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; - -{% endif %} -{# ===== First Drop and then create mat view ===== #} -{% if def and def != o_data.definition.rstrip(';') %} -DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }}; -CREATE MATERIALIZED VIEW IF NOT EXISTS {{ conn|qtIdent(view_schema, view_name) }} -{% if data.amname and data.amname != o_data.amname %} -USING {{ data.amname }} -{% endif %} -{% if data.fillfactor or o_data.fillfactor or data.toast_tuple_target or o_data.toast_tuple_target %} -WITH( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% if data.toast_tuple_target or o_data.toast_tuple_target or (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% elif o_data.fillfactor %} - FILLFACTOR = {{ o_data.fillfactor }}{% if data.toast_tuple_target or o_data.toast_tuple_target or (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% endif %} -{% if data.toast_tuple_target %} - TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% elif o_data.toast_tuple_target %} - TOAST_TUPLE_TARGET = {{ o_data.toast_tuple_target }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% endif %} - -{% if data['vacuum_data']['changed']|length > 0 %} -{% for field in data['vacuum_data']['changed'] %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endfor %} -{% endif %} -) -{% endif %} - AS -{{ def }} -{% if data.with_data is defined %} - WITH {{ 'DATA' if data.with_data else 'NO DATA' }}; -{% elif o_data.with_data is defined %} - WITH {{ 'DATA' if o_data.with_data else 'NO DATA' }}; - -{% endif %} -{% if o_data.owner and not data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(o_data.owner) }}; - -{% endif %} -{% if o_data.comment and not data.comment %} -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ o_data.comment|qtLiteral(conn) }}; -{% endif %} -{% else %} -{# ======= Alter Tablespace ========= #} -{%- if data.spcname and o_data.spcname != data.spcname -%} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - SET TABLESPACE {{ data.spcname }}; - -{% endif %} -{# ======= SET/RESET Fillfactor ========= #} -{% if data.fillfactor and o_data.fillfactor != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -SET( - FILLFACTOR = {{ data.fillfactor }} -); - -{% elif data.fillfactor == '' and o_data.fillfactor|default('', 'true') != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -RESET( - FILLFACTOR -); - -{% endif %} -{# ======= SET/RESET Toast Tuple Target ========= #} -{% if data.toast_tuple_target and o_data.toast_tuple_target != data.toast_tuple_target %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -SET( - TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }} -); - -{% elif (data.toast_tuple_target == '' or data.toast_tuple_target == None) and data.toast_tuple_target != o_data.toast_tuple_target %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -RESET( - TOAST_TUPLE_TARGET -); - -{% endif %} -{# ===== Check for with_data property ===== #} -{% if data.with_data is defined and o_data.with_data|lower != data.with_data|lower %} -REFRESH MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} WITH{{ ' NO' if data.with_data|lower == 'false' else '' }} DATA; - -{% endif %} -{# ===== Check for Autovacuum options ===== #} -{% if data.autovacuum_custom is defined and data.autovacuum_custom == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - autovacuum_enabled, - autovacuum_vacuum_threshold, - autovacuum_analyze_threshold, - autovacuum_vacuum_scale_factor, - autovacuum_analyze_scale_factor, - autovacuum_vacuum_cost_delay, - autovacuum_vacuum_cost_limit, - autovacuum_freeze_min_age, - autovacuum_freeze_max_age, - autovacuum_freeze_table_age -); - -{% endif %} - -{% if data.toast_autovacuum is defined and data.toast_autovacuum == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - toast.autovacuum_enabled, - toast.autovacuum_vacuum_threshold, - toast.autovacuum_analyze_threshold, - toast.autovacuum_vacuum_scale_factor, - toast.autovacuum_analyze_scale_factor, - toast.autovacuum_vacuum_cost_delay, - toast.autovacuum_vacuum_cost_limit, - toast.autovacuum_freeze_min_age, - toast.autovacuum_freeze_max_age, - toast.autovacuum_freeze_table_age -); - -{% endif %}{#-- toast_endif ends --#} -{% if data['vacuum_data']['changed']|length > 0 or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} SET( -{% if data.autovacuum_enabled in ('t', 'f') %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 or data.toast_autovacuum_enabled in ('t', 'f') %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled in ('t', 'f') %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['changed'] %} -{% if field.value != None %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} - -); -{% endif %} -{% if data['vacuum_data']['reset']|length > 0 or data.autovacuum_enabled == 'x' or data.toast_autovacuum_enabled == 'x' %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( -{% if data.autovacuum_enabled == 'x' %} - autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 or data.toast_autovacuum_enabled == 'x' %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled == 'x' %} - toast.autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['reset'] %} {{ field.name }}{% if not loop.last %}, -{% endif %} -{% endfor %} - -); -{% endif %} -{# ===== End check for custom autovacuum ===== #} -{% endif %}{# ===== End block for check data definition ===== #} -{% set old_comment = o_data.comment|default('', true) %} -{% if (data.comment is defined and (data.comment != old_comment)) %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{# ============= The SQL generated below will change privileges ============= #} -{% if data.datacl %} -{% if 'deleted' in data.datacl %} -{% for priv in data.datacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.datacl %} -{% for priv in data.datacl.changed -%} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.old_grantee, data.name, data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{%- endfor %} -{% endif %} -{% if 'added' in data.datacl %} -{% for priv in data.datacl.added %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{# ============== The SQL generated below will change Security Label ========= #} -{% if data.seclabels is not none and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'MATERIALIZED VIEW', data.name, r.provider, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/create.sql deleted file mode 100644 index 48a882fc287..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/create.sql +++ /dev/null @@ -1,59 +0,0 @@ -{# ===================== Create new view ===================== #} -{% if display_comments %} --- View: {{ data.schema }}.{{ data.name }} - --- DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(data.schema, data.name) }}; - -{% endif %} -{% if data.name and data.schema and data.definition %} -CREATE MATERIALIZED VIEW{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} -{% if data.default_amname and data.default_amname != data.amname %} -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} -USING {{data.amname}} -{% endif %} -{% if(data.fillfactor or data.toast_tuple_target or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') or data['vacuum_data']|length > 0) %} -{% set ns = namespace(add_comma=false) %} -WITH ( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% set ns.add_comma = true%}{% endif %}{% if data.toast_tuple_target %} -{% if ns.add_comma %}, -{% endif %} TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %} -{% for field in data['vacuum_data'] %} -{% if field.value is defined and field.value != '' and field.value != none %} -{% if ns.add_comma %}, -{% endif %} {{ field.name }} = {{ field.value|lower }}{% set ns.add_comma = true%}{% endif %}{% endfor %} -{{ '\n' }}) -{% endif %} -{% if data.spcname %}TABLESPACE {{ data.spcname }} -{% endif %}AS -{{ data.definition.rstrip(';') }} -{% if data.with_data %} -WITH DATA; -{% else %} -WITH NO DATA; -{% endif %} -{% if data.owner %} - -ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; -{% endif %} -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} -{% if data.comment %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql deleted file mode 100644 index 94eba176e89..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/properties.sql +++ /dev/null @@ -1,120 +0,0 @@ -{# ========================== Fetch Materialized View Properties ========================= #} -{% if (vid and datlastsysoid) or scid %} -SELECT - c.oid, - c.xmin, - c.relname AS name, - c.reltablespace AS spcoid, - c.relispopulated AS with_data, - CASE WHEN length(spcname::text) > 0 THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st - WHERE st.name = 'default_table_access_method') as default_amname, - c.relacl, - nsp.nspname as schema, - pg_catalog.pg_get_userbyid(c.relowner) AS owner, - description AS comment, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = c.oid - ) AS dependsonextensions, - pg_catalog.pg_get_viewdef(c.oid, true) AS definition, - {# ============= Checks if it is system view ================ #} - {% if vid and datlastsysoid %} - CASE WHEN {{vid}} <= {{datlastsysoid}} THEN True ELSE False END AS system_view, - {% endif %} - pg_catalog.array_to_string(c.relacl::text[], ', ') AS acl, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=c.oid AND sl1.objsubid=0) AS seclabels, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'fillfactor=([0-9]*)') AS fillfactor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'toast_tuple_target=([0-9]*)') AS toast_tuple_target, - (substring(pg_catalog.array_to_string(c.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, am.amname, - (CASE WHEN c.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable -FROM - pg_catalog.pg_class c -LEFT OUTER JOIN pg_catalog.pg_namespace nsp on nsp.oid = c.relnamespace -LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=c.reltablespace -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid and des.objsubid=0 AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = c.reltoastrelid -LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = c.relam - WHERE ((c.relhasrules AND (EXISTS ( - SELECT - r.rulename - FROM - pg_catalog.pg_rewrite r - WHERE - ((r.ev_class = c.oid) - AND (pg_catalog.bpchar(r.ev_type) = '1'::bpchar)) ))) - AND (c.relkind = 'm'::char) - ) -{% if (vid and datlastsysoid) %} - AND c.oid = {{vid}}::oid -{% elif scid %} - AND c.relnamespace = {{scid}}::oid -ORDER BY - c.relname -{% endif %} - -{% elif type == 'roles' %} -SELECT - pr.rolname -FROM - pg_catalog.pg_roles pr -WHERE - pr.rolcanlogin -ORDER BY - pr.rolname - -{% elif type == 'schemas' %} -SELECT - nsp.nspname -FROM - pg_catalog.pg_namespace nsp -WHERE - (nsp.nspname NOT LIKE E'pg\\_%' - AND nsp.nspname != 'information_schema') -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/update.sql deleted file mode 100644 index e7474862be0..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/13_plus/sql/update.sql +++ /dev/null @@ -1,240 +0,0 @@ -{# ===================== Update View ===================#} -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{%- if data -%} -{% set view_name = data.name if data.name else o_data.name %} -{% set view_schema = data.schema if data.schema else o_data.schema %} -{% set def = data.definition.rstrip(';') if data.definition %} -{# ===== Rename mat view ===== #} -{% if data.name and data.name != o_data.name %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{# ===== Alter schema view ===== #} -{% if data.schema and data.schema != o_data.schema %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, view_name ) }} - SET SCHEMA {{ conn|qtIdent(data.schema) }}; - -{% endif %} -{# ===== Alter Table owner ===== #} -{% if data.owner and data.owner != o_data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; - -{% endif %} -{# ===== First Drop and then create mat view ===== #} -{% if def and def != o_data.definition.rstrip(';') %} -DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }}; -CREATE MATERIALIZED VIEW IF NOT EXISTS {{ conn|qtIdent(view_schema, view_name) }} -{% if data.amname and data.amname != o_data.amname %} -USING {{ data.amname }} -{% endif %} -{% if data.fillfactor or o_data.fillfactor or data.toast_tuple_target or o_data.toast_tuple_target %} -WITH( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% if data.toast_tuple_target or o_data.toast_tuple_target or (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% elif o_data.fillfactor %} - FILLFACTOR = {{ o_data.fillfactor }}{% if data.toast_tuple_target or o_data.toast_tuple_target or (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% endif %} -{% if data.toast_tuple_target %} - TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% elif o_data.toast_tuple_target %} - TOAST_TUPLE_TARGET = {{ o_data.toast_tuple_target }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% endif %} - -{% if data['vacuum_data']['changed']|length > 0 %} -{% for field in data['vacuum_data']['changed'] %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endfor %} -{% endif %} -) -{% endif %} - AS -{{ def }} -{% if data.with_data is defined %} - WITH {{ 'DATA' if data.with_data else 'NO DATA' }}; -{% elif o_data.with_data is defined %} - WITH {{ 'DATA' if o_data.with_data else 'NO DATA' }}; - -{% endif %} -{% if o_data.owner and not data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(o_data.owner) }}; - -{% endif %} -{% if o_data.comment and not data.comment %} -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ o_data.comment|qtLiteral(conn) }}; -{% endif %} -{% else %} -{# ======= Alter Tablespace ========= #} -{%- if data.spcname and o_data.spcname != data.spcname -%} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - SET TABLESPACE {{ data.spcname }}; - -{% endif %} -{# ======= SET/RESET Fillfactor ========= #} -{% if data.fillfactor and o_data.fillfactor != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -SET( - FILLFACTOR = {{ data.fillfactor }} -); - -{% elif data.fillfactor == '' and o_data.fillfactor|default('', 'true') != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -RESET( - FILLFACTOR -); - -{% endif %} -{# ======= SET/RESET Toast Tuple Target ========= #} -{% if data.toast_tuple_target and o_data.toast_tuple_target != data.toast_tuple_target %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -SET( - TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }} -); - -{% elif (data.toast_tuple_target == '' or data.toast_tuple_target == None) and data.toast_tuple_target != o_data.toast_tuple_target %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -RESET( - TOAST_TUPLE_TARGET -); - -{% endif %} -{# ===== Check for with_data property ===== #} -{% if data.with_data is defined and o_data.with_data|lower != data.with_data|lower %} -REFRESH MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} WITH{{ ' NO' if data.with_data|lower == 'false' else '' }} DATA; - -{% endif %} -{# ===== Check for Autovacuum options ===== #} -{% if data.autovacuum_custom is defined and data.autovacuum_custom == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - autovacuum_enabled, - autovacuum_vacuum_threshold, - autovacuum_analyze_threshold, - autovacuum_vacuum_scale_factor, - autovacuum_analyze_scale_factor, - autovacuum_vacuum_cost_delay, - autovacuum_vacuum_cost_limit, - autovacuum_freeze_min_age, - autovacuum_freeze_max_age, - autovacuum_freeze_table_age -); - -{% endif %} - -{% if data.toast_autovacuum is defined and data.toast_autovacuum == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - toast.autovacuum_enabled, - toast.autovacuum_vacuum_threshold, - toast.autovacuum_analyze_threshold, - toast.autovacuum_vacuum_scale_factor, - toast.autovacuum_analyze_scale_factor, - toast.autovacuum_vacuum_cost_delay, - toast.autovacuum_vacuum_cost_limit, - toast.autovacuum_freeze_min_age, - toast.autovacuum_freeze_max_age, - toast.autovacuum_freeze_table_age -); - -{% endif %}{#-- toast_endif ends --#} -{% if data['vacuum_data']['changed']|length > 0 or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} SET( -{% if data.autovacuum_enabled in ('t', 'f') %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 or data.toast_autovacuum_enabled in ('t', 'f') %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled in ('t', 'f') %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['changed'] %} -{% if field.value != None %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} - -); -{% endif %} -{% if data['vacuum_data']['reset']|length > 0 or data.autovacuum_enabled == 'x' or data.toast_autovacuum_enabled == 'x' %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( -{% if data.autovacuum_enabled == 'x' %} - autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 or data.toast_autovacuum_enabled == 'x' %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled == 'x' %} - toast.autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['reset'] %} {{ field.name }}{% if not loop.last %}, -{% endif %} -{% endfor %} - -); -{% endif %} -{# ===== End check for custom autovacuum ===== #} -{% endif %}{# ===== End block for check data definition ===== #} -{% set old_comment = o_data.comment|default('', true) %} -{% if (data.comment is defined and (data.comment != old_comment)) %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{# ============= The SQL generated below will change privileges ============= #} -{% if data.datacl %} -{% if 'deleted' in data.datacl %} -{% for priv in data.datacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.datacl %} -{% for priv in data.datacl.changed -%} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.old_grantee, data.name, data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{%- endfor %} -{% endif %} -{% if 'added' in data.datacl %} -{% for priv in data.datacl.added %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{# ============== The SQL generated below will change Security Label ========= #} -{% if data.seclabels is not none and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'MATERIALIZED VIEW', data.name, r.provider, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/create.sql index 614e3f04c4a..48a882fc287 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/create.sql @@ -7,6 +7,11 @@ {% endif %} {% if data.name and data.schema and data.definition %} CREATE MATERIALIZED VIEW{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} +{% if data.default_amname and data.default_amname != data.amname %} +USING {{data.amname}} +{% elif not data.default_amname and data.amname %} +USING {{data.amname}} +{% endif %} {% if(data.fillfactor or data.toast_tuple_target or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') or data['vacuum_data']|length > 0) %} {% set ns = namespace(add_comma=false) %} WITH ( @@ -39,6 +44,13 @@ WITH NO DATA; ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} OWNER TO {{ conn|qtIdent(data.owner) }}; {% endif %} +{% if data.dependsonextensions %} +{% for ext in data.dependsonextensions %} + +ALTER MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endfor %} +{% endif %} {% if data.comment %} COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/create_access_method.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/create_access_method.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/create_access_method.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/create_access_method.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/get_access_methods.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/get_access_methods.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/12_plus/sql/get_access_methods.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/get_access_methods.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/properties.sql index 3a873514bce..94eba176e89 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/properties.sql @@ -11,10 +11,18 @@ SELECT JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid WHERE dtb.oid = {{ did }}::oid) END as spcname, + (SELECT st.setting from pg_catalog.pg_show_all_settings() st + WHERE st.name = 'default_table_access_method') as default_amname, c.relacl, nsp.nspname as schema, pg_catalog.pg_get_userbyid(c.relowner) AS owner, description AS comment, + ( + SELECT array_agg(DISTINCT e.extname) + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid + WHERE d.objid = c.oid + ) AS dependsonextensions, pg_catalog.pg_get_viewdef(c.oid, true) AS definition, {# ============= Checks if it is system view ================ #} {% if vid and datlastsysoid %} @@ -64,7 +72,7 @@ SELECT FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, + c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, am.amname, (CASE WHEN c.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable FROM pg_catalog.pg_class c @@ -72,6 +80,7 @@ LEFT OUTER JOIN pg_catalog.pg_namespace nsp on nsp.oid = c.relnamespace LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=c.reltablespace LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid and des.objsubid=0 AND des.classoid='pg_class'::regclass) LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = c.reltoastrelid +LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = c.relam WHERE ((c.relhasrules AND (EXISTS ( SELECT r.rulename diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/update.sql index f76008566b8..e7474862be0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/default/sql/update.sql @@ -27,25 +27,24 @@ ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} {% if def and def != o_data.definition.rstrip(';') %} DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }}; CREATE MATERIALIZED VIEW IF NOT EXISTS {{ conn|qtIdent(view_schema, view_name) }} +{% if data.amname and data.amname != o_data.amname %} +USING {{ data.amname }} +{% endif %} {% if data.fillfactor or o_data.fillfactor or data.toast_tuple_target or o_data.toast_tuple_target %} -{% set ns = namespace(add_comma=false) %} WITH( {% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% set ns.add_comma = true %} + FILLFACTOR = {{ data.fillfactor }}{% if data.toast_tuple_target or o_data.toast_tuple_target or (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} {% elif o_data.fillfactor %} - FILLFACTOR = {{ o_data.fillfactor }}{% set ns.add_comma = true %} + FILLFACTOR = {{ o_data.fillfactor }}{% if data.toast_tuple_target or o_data.toast_tuple_target or (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} {% endif %} {% if data.toast_tuple_target %} -{% if ns.add_comma %}, -{% endif %} TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }}{% set ns.add_comma = true %} + TOAST_TUPLE_TARGET = {{ data.toast_tuple_target }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} {% elif o_data.toast_tuple_target %} -{% if ns.add_comma %}, -{% endif %} TOAST_TUPLE_TARGET = {{ o_data.toast_tuple_target }}{% set ns.add_comma = true %} + TOAST_TUPLE_TARGET = {{ o_data.toast_tuple_target }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} {% endif %} {% if data['vacuum_data']['changed']|length > 0 %} -{% if ns.add_comma %}, -{% endif %}{% for field in data['vacuum_data']['changed'] %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, +{% for field in data['vacuum_data']['changed'] %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, {% endif %} {% endfor %} {% endif %} @@ -70,9 +69,9 @@ COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} {% endif %} {% else %} {# ======= Alter Tablespace ========= #} -{%- if data.spcoid and o_data.spcoid != data.spcoid -%} +{%- if data.spcname and o_data.spcname != data.spcname -%} ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - SET TABLESPACE {{ data.spcoid }}; + SET TABLESPACE {{ data.spcname }}; {% endif %} {# ======= SET/RESET Fillfactor ========= #} @@ -224,4 +223,18 @@ COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} {% endfor %} {% endif %} {% endif %} +{% set old_exts = (o_data.dependsonextensions or []) | list %} +{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} +{% if new_exts is not none and old_exts != new_exts %} +{% for ext in (old_exts + new_exts) | unique %} + +{% if ext in new_exts and ext not in old_exts %} +ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% elif ext in old_exts and ext not in new_exts %} +ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} + NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endif %} +{% endfor %} +{% endif %} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/create.sql deleted file mode 100644 index 64b8597765d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/create.sql +++ /dev/null @@ -1,50 +0,0 @@ -{# ===================== Create new view ===================== #} -{% if display_comments %} --- View: {{ data.schema }}.{{ data.name }} - --- DROP MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }}; - -{% endif %} -{% if data.name and data.schema and data.definition %} -CREATE MATERIALIZED VIEW{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} -{% if data.default_amname and data.default_amname != data.amname %} -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} -USING {{data.amname}} -{% endif %} -{% if(data.fillfactor or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') or data['vacuum_data']|length > 0) %} -{% set ns = namespace(add_comma=false) %} -WITH ( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %} -{% for field in data['vacuum_data'] %} -{% if field.value is defined and field.value != '' and field.value != none %} -{% if ns.add_comma %}, -{% endif %} {{ field.name }} = {{ field.value|lower }}{% set ns.add_comma = true%}{% endif %}{% endfor %} -{{ '\n' }}) -{% endif %} -{% if data.spcname %}TABLESPACE {{ data.spcname }} -{% endif %}AS -{{ data.definition.rstrip(';') }} -{% if data.with_data %} -WITH DATA; -{% else %} -WITH NO DATA; -{% endif %} -{% if data.owner %} - -ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; -{% endif %} -{% if data.comment %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/properties.sql deleted file mode 100644 index ae8df20fa0f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/properties.sql +++ /dev/null @@ -1,112 +0,0 @@ -{# ========================== Fetch Materialized View Properties ========================= #} -{% if (vid and datlastsysoid) or scid %} -SELECT - c.oid, - c.xmin, - c.relname AS name, - c.reltablespace AS spcoid, - c.relispopulated AS with_data, - CASE WHEN length(spcname::text) > 0 THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st - WHERE st.name = 'default_table_access_method') as default_amname, - c.relacl, - nsp.nspname as schema, - pg_catalog.pg_get_userbyid(c.relowner) AS owner, - description AS comment, - pg_catalog.pg_get_viewdef(c.oid) AS definition, - {# ============= Checks if it is system view ================ #} - {% if vid and datlastsysoid %} - CASE WHEN {{vid}} <= {{datlastsysoid}} THEN True ELSE False END AS system_view, - {% endif %} - pg_catalog.array_to_string(c.relacl::text[], ', ') AS acl, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=c.oid AND sl1.objsubid=0) AS seclabels, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(c.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, am.amname, - (CASE WHEN c.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable -FROM - pg_catalog.pg_class c -LEFT OUTER JOIN pg_catalog.pg_namespace nsp on nsp.oid = c.relnamespace -LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=c.reltablespace -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid and des.objsubid=0 AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = c.reltoastrelid -LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = c.relam - WHERE ((c.relhasrules AND (EXISTS ( - SELECT - r.rulename - FROM - pg_catalog.pg_rewrite r - WHERE - ((r.ev_class = c.oid) - AND (pg_catalog.bpchar(r.ev_type) = '1'::bpchar)) ))) - AND (c.relkind = 'm'::char) - ) -{% if (vid and datlastsysoid) %} - AND c.oid = {{vid}}::oid -{% elif scid %} - AND c.relnamespace = {{scid}}::oid -ORDER BY - c.relname -{% endif %} - -{% elif type == 'roles' %} -SELECT - pr.rolname -FROM - pg_catalog.pg_roles pr -WHERE - pr.rolcanlogin -ORDER BY - pr.rolname - -{% elif type == 'schemas' %} -SELECT - nsp.nspname -FROM - pg_catalog.pg_namespace nsp -WHERE - (nsp.nspname NOT LIKE E'pg\\_%' - AND nsp.nspname != 'information_schema') -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/update.sql deleted file mode 100644 index 997f27528d4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/update.sql +++ /dev/null @@ -1,207 +0,0 @@ -{# ===================== Update View ===================#} -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{%- if data -%} -{% set view_name = data.name if data.name else o_data.name %} -{% set view_schema = data.schema if data.schema else o_data.schema %} -{% set def = data.definition.rstrip(';') if data.definition %} -{# ===== Rename mat view ===== #} -{% if data.name and data.name != o_data.name %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{# ===== Alter schema view ===== #} -{% if data.schema and data.schema != o_data.schema %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, view_name ) }} - SET SCHEMA {{ conn|qtIdent(data.schema) }}; - -{% endif %} -{# ===== Alter Table owner ===== #} -{% if data.owner and data.owner != o_data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; - -{% endif %} -{# ===== First Drop and then create mat view ===== #} -{% if def and def != o_data.definition.rstrip(';') %} -DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }}; -CREATE MATERIALIZED VIEW IF NOT EXISTS {{ conn|qtIdent(view_schema, view_name) }} -{% if data.amname and data.amname != o_data.amname %} -USING {{ data.amname }} -{% endif %} -{% if data.fillfactor or o_data.fillfactor %} -WITH( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% elif o_data.fillfactor %} - FILLFACTOR = {{ o_data.fillfactor }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% endif %} - -{% if data['vacuum_data']['changed']|length > 0 %} -{% for field in data['vacuum_data']['changed'] %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endfor %} -{% endif %} -) -{% endif %} - AS -{{ def }} -{% if data.with_data is defined %} - WITH {{ 'DATA' if data.with_data else 'NO DATA' }}; -{% elif o_data.with_data is defined %} - WITH {{ 'DATA' if o_data.with_data else 'NO DATA' }}; - -{% endif %} -{% if o_data.owner and not data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(o_data.owner) }}; - -{% endif %} -{% if o_data.comment and not data.comment %} -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ o_data.comment|qtLiteral(conn) }}; -{% endif %} -{% else %} -{# ======= Alter Tablespace ========= #} -{%- if data.spcoid and o_data.spcoid != data.spcoid -%} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - SET TABLESPACE {{ data.spcoid }}; - -{% endif %} -{# ======= SET/RESET Fillfactor ========= #} -{% if data.fillfactor and o_data.fillfactor != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -SET( - FILLFACTOR = {{ data.fillfactor }} -); - -{% elif data.fillfactor == '' and o_data.fillfactor|default('', 'true') != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -RESET( - FILLFACTOR -); - -{% endif %} -{# ===== Check for with_data property ===== #} -{% if data.with_data is defined and o_data.with_data|lower != data.with_data|lower %} -REFRESH MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} WITH{{ ' NO' if data.with_data|lower == 'false' else '' }} DATA; - -{% endif %} -{# ===== Check for Autovacuum options ===== #} -{% if data.autovacuum_custom is defined and data.autovacuum_custom == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - autovacuum_enabled, - autovacuum_vacuum_threshold, - autovacuum_analyze_threshold, - autovacuum_vacuum_scale_factor, - autovacuum_analyze_scale_factor, - autovacuum_vacuum_cost_delay, - autovacuum_vacuum_cost_limit, - autovacuum_freeze_min_age, - autovacuum_freeze_max_age, - autovacuum_freeze_table_age -); - -{% endif %} - -{% if data.toast_autovacuum is defined and data.toast_autovacuum == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - toast.autovacuum_enabled, - toast.autovacuum_vacuum_threshold, - toast.autovacuum_analyze_threshold, - toast.autovacuum_vacuum_scale_factor, - toast.autovacuum_analyze_scale_factor, - toast.autovacuum_vacuum_cost_delay, - toast.autovacuum_vacuum_cost_limit, - toast.autovacuum_freeze_min_age, - toast.autovacuum_freeze_max_age, - toast.autovacuum_freeze_table_age -); - -{% endif %}{#-- toast_endif ends --#} -{% if data['vacuum_data']['changed']|length > 0 or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} SET( -{% if data.autovacuum_enabled in ('t', 'f') %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 or data.toast_autovacuum_enabled in ('t', 'f') %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled in ('t', 'f') %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['changed'] %} -{% if field.value != None %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} - -); -{% endif %} -{% if data['vacuum_data']['reset']|length > 0 or data.autovacuum_enabled == 'x' or data.toast_autovacuum_enabled == 'x' %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( -{% if data.autovacuum_enabled == 'x' %} - autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 or data.toast_autovacuum_enabled == 'x' %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled == 'x' %} - toast.autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['reset'] %} {{ field.name }}{% if not loop.last %}, -{% endif %} -{% endfor %} - -); -{% endif %} -{# ===== End check for custom autovacuum ===== #} -{% endif %}{# ===== End block for check data definition ===== #} -{% set old_comment = o_data.comment|default('', true) %} -{% if (data.comment is defined and (data.comment != old_comment)) %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{# ============= The SQL generated below will change privileges ============= #} -{% if data.datacl %} -{% if 'deleted' in data.datacl %} -{% for priv in data.datacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.datacl %} -{% for priv in data.datacl.changed -%} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.old_grantee, data.name, data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{%- endfor %} -{% endif %} -{% if 'added' in data.datacl %} -{% for priv in data.datacl.added %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{# ============== The SQL generated below will change Security Label ========= #} -{% if data.seclabels is not none and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'MATERIALIZED VIEW', data.name, r.provider, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/create.sql deleted file mode 100644 index 3bea9ebfaac..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/create.sql +++ /dev/null @@ -1,57 +0,0 @@ -{# ===================== Create new view ===================== #} -{% if display_comments %} --- View: {{ data.schema }}.{{ data.name }} - --- DROP MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }}; - -{% endif %} -{% if data.name and data.schema and data.definition %} -CREATE MATERIALIZED VIEW{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} -{% if data.default_amname and data.default_amname != data.amname %} -USING {{data.amname}} -{% elif not data.default_amname and data.amname %} -USING {{data.amname}} -{% endif %} -{% if(data.fillfactor or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') or data['vacuum_data']|length > 0) %} -{% set ns = namespace(add_comma=false) %} -WITH ( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% set ns.add_comma = true%}{% endif %}{% if data.autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %}{% if data.toast_autovacuum_enabled in ('t', 'f') %} -{% if ns.add_comma %}, -{% endif %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}TRUE{% else %}FALSE{% endif %}{% set ns.add_comma = true%}{% endif %} -{% for field in data['vacuum_data'] %} -{% if field.value is defined and field.value != '' and field.value != none %} -{% if ns.add_comma %}, -{% endif %} {{ field.name }} = {{ field.value|lower }}{% set ns.add_comma = true%}{% endif %}{% endfor %} -{{ '\n' }}) -{% endif %} -{% if data.spcname %}TABLESPACE {{ data.spcname }} -{% endif %}AS -{{ data.definition.rstrip(';') }} -{% if data.with_data %} -WITH DATA; -{% else %} -WITH NO DATA; -{% endif %} -{% if data.owner %} - -ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; -{% endif %} -{% if data.dependsonextensions %} -{% for ext in data.dependsonextensions %} - -ALTER MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endfor %} -{% endif %} -{% if data.comment %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql deleted file mode 100644 index 0c1113ceb0b..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/properties.sql +++ /dev/null @@ -1,118 +0,0 @@ -{# ========================== Fetch Materialized View Properties ========================= #} -{% if (vid and datlastsysoid) or scid %} -SELECT - c.oid, - c.xmin, - c.relname AS name, - c.reltablespace AS spcoid, - c.relispopulated AS with_data, - CASE WHEN length(spcname::text) > 0 THEN spcname ELSE - (SELECT sp.spcname FROM pg_catalog.pg_database dtb - JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid - WHERE dtb.oid = {{ did }}::oid) - END as spcname, - (SELECT st.setting from pg_catalog.pg_show_all_settings() st - WHERE st.name = 'default_table_access_method') as default_amname, - c.relacl, - nsp.nspname as schema, - pg_catalog.pg_get_userbyid(c.relowner) AS owner, - description AS comment, - ( - SELECT array_agg(DISTINCT e.extname) - FROM pg_catalog.pg_depend d - JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid - WHERE d.objid = c.oid - ) AS dependsonextensions, - pg_catalog.pg_get_viewdef(c.oid) AS definition, - {# ============= Checks if it is system view ================ #} - {% if vid and datlastsysoid %} - CASE WHEN {{vid}} <= {{datlastsysoid}} THEN True ELSE False END AS system_view, - {% endif %} - pg_catalog.array_to_string(c.relacl::text[], ', ') AS acl, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=c.oid AND sl1.objsubid=0) AS seclabels, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'fillfactor=([0-9]*)') AS fillfactor, - (substring(pg_catalog.array_to_string(c.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS autovacuum_enabled, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(c.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS autovacuum_freeze_table_age, - (substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_enabled=([a-z|0-9]*)'))::BOOL AS toast_autovacuum_enabled, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_threshold=([0-9]*)') AS toast_autovacuum_vacuum_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_vacuum_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_threshold=([0-9]*)') AS toast_autovacuum_analyze_threshold, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_analyze_scale_factor=([0-9]*[.]?[0-9]*)') AS toast_autovacuum_analyze_scale_factor, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_delay=([0-9]*)') AS toast_autovacuum_vacuum_cost_delay, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_vacuum_cost_limit=([0-9]*)') AS toast_autovacuum_vacuum_cost_limit, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_min_age=([0-9]*)') AS toast_autovacuum_freeze_min_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, - substring(pg_catalog.array_to_string(tst.reloptions, ',') - FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, am.amname, - (CASE WHEN c.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable -FROM - pg_catalog.pg_class c -LEFT OUTER JOIN pg_catalog.pg_namespace nsp on nsp.oid = c.relnamespace -LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=c.reltablespace -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid and des.objsubid=0 AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = c.reltoastrelid -LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = c.relam - WHERE ((c.relhasrules AND (EXISTS ( - SELECT - r.rulename - FROM - pg_catalog.pg_rewrite r - WHERE - ((r.ev_class = c.oid) - AND (pg_catalog.bpchar(r.ev_type) = '1'::bpchar)) ))) - AND (c.relkind = 'm'::char) - ) -{% if (vid and datlastsysoid) %} - AND c.oid = {{vid}}::oid -{% elif scid %} - AND c.relnamespace = {{scid}}::oid -ORDER BY - c.relname -{% endif %} - -{% elif type == 'roles' %} -SELECT - pr.rolname -FROM - pg_catalog.pg_roles pr -WHERE - pr.rolcanlogin -ORDER BY - pr.rolname - -{% elif type == 'schemas' %} -SELECT - nsp.nspname -FROM - pg_catalog.pg_namespace nsp -WHERE - (nsp.nspname NOT LIKE E'pg\\_%' - AND nsp.nspname != 'information_schema') -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/update.sql deleted file mode 100644 index 840135c546d..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/13_plus/sql/update.sql +++ /dev/null @@ -1,221 +0,0 @@ -{# ===================== Update View ===================#} -{% import 'macros/schemas/security.macros' as SECLABEL %} -{% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{%- if data -%} -{% set view_name = data.name if data.name else o_data.name %} -{% set view_schema = data.schema if data.schema else o_data.schema %} -{% set def = data.definition.rstrip(';') if data.definition %} -{# ===== Rename mat view ===== #} -{% if data.name and data.name != o_data.name %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} -{# ===== Alter schema view ===== #} -{% if data.schema and data.schema != o_data.schema %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(o_data.schema, view_name ) }} - SET SCHEMA {{ conn|qtIdent(data.schema) }}; - -{% endif %} -{# ===== Alter Table owner ===== #} -{% if data.owner and data.owner != o_data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(data.owner) }}; - -{% endif %} -{# ===== First Drop and then create mat view ===== #} -{% if def and def != o_data.definition.rstrip(';') %} -DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }}; -CREATE MATERIALIZED VIEW IF NOT EXISTS {{ conn|qtIdent(view_schema, view_name) }} -{% if data.amname and data.amname != o_data.amname %} -USING {{ data.amname }} -{% endif %} -{% if data.fillfactor or o_data.fillfactor %} -WITH( -{% if data.fillfactor %} - FILLFACTOR = {{ data.fillfactor }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% elif o_data.fillfactor %} - FILLFACTOR = {{ o_data.fillfactor }}{% if (data['vacuum_data'] is defined and data['vacuum_data']['changed']|length > 0) %},{% endif %} -{% endif %} - -{% if data['vacuum_data']['changed']|length > 0 %} -{% for field in data['vacuum_data']['changed'] %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endfor %} -{% endif %} -) -{% endif %} - AS -{{ def }} -{% if data.with_data is defined %} - WITH {{ 'DATA' if data.with_data else 'NO DATA' }}; -{% elif o_data.with_data is defined %} - WITH {{ 'DATA' if o_data.with_data else 'NO DATA' }}; - -{% endif %} -{% if o_data.owner and not data.owner %} -ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - OWNER TO {{ conn|qtIdent(o_data.owner) }}; - -{% endif %} -{% if o_data.comment and not data.comment %} -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ o_data.comment|qtLiteral(conn) }}; -{% endif %} -{% else %} -{# ======= Alter Tablespace ========= #} -{%- if data.spcoid and o_data.spcoid != data.spcoid -%} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} - SET TABLESPACE {{ data.spcoid }}; - -{% endif %} -{# ======= SET/RESET Fillfactor ========= #} -{% if data.fillfactor and o_data.fillfactor != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -SET( - FILLFACTOR = {{ data.fillfactor }} -); - -{% elif data.fillfactor == '' and o_data.fillfactor|default('', 'true') != data.fillfactor %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} -RESET( - FILLFACTOR -); - -{% endif %} -{# ===== Check for with_data property ===== #} -{% if data.with_data is defined and o_data.with_data|lower != data.with_data|lower %} -REFRESH MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} WITH{{ ' NO' if data.with_data|lower == 'false' else '' }} DATA; - -{% endif %} -{# ===== Check for Autovacuum options ===== #} -{% if data.autovacuum_custom is defined and data.autovacuum_custom == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - autovacuum_enabled, - autovacuum_vacuum_threshold, - autovacuum_analyze_threshold, - autovacuum_vacuum_scale_factor, - autovacuum_analyze_scale_factor, - autovacuum_vacuum_cost_delay, - autovacuum_vacuum_cost_limit, - autovacuum_freeze_min_age, - autovacuum_freeze_max_age, - autovacuum_freeze_table_age -); - -{% endif %} - -{% if data.toast_autovacuum is defined and data.toast_autovacuum == False %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( - toast.autovacuum_enabled, - toast.autovacuum_vacuum_threshold, - toast.autovacuum_analyze_threshold, - toast.autovacuum_vacuum_scale_factor, - toast.autovacuum_analyze_scale_factor, - toast.autovacuum_vacuum_cost_delay, - toast.autovacuum_vacuum_cost_limit, - toast.autovacuum_freeze_min_age, - toast.autovacuum_freeze_max_age, - toast.autovacuum_freeze_table_age -); - -{% endif %}{#-- toast_endif ends --#} -{% if data['vacuum_data']['changed']|length > 0 or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} SET( -{% if data.autovacuum_enabled in ('t', 'f') %} - autovacuum_enabled = {% if data.autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 or data.toast_autovacuum_enabled in ('t', 'f') %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled in ('t', 'f') %} - toast.autovacuum_enabled = {% if data.toast_autovacuum_enabled == 't' %}true{% else %}false{% endif %}{% if data['vacuum_data']['changed']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['changed'] %} -{% if field.value != None %} {{ field.name }} = {{ field.value|lower }}{% if not loop.last %}, -{% endif %} -{% endif %} -{% endfor %} - -); -{% endif %} -{% if data['vacuum_data']['reset']|length > 0 or data.autovacuum_enabled == 'x' or data.toast_autovacuum_enabled == 'x' %} -ALTER MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} RESET( -{% if data.autovacuum_enabled == 'x' %} - autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 or data.toast_autovacuum_enabled == 'x' %}, -{% endif %} -{% endif %} -{% if data.toast_autovacuum_enabled == 'x' %} - toast.autovacuum_enabled{% if data['vacuum_data']['reset']|length > 0 %}, -{% endif %} -{% endif %} -{% for field in data['vacuum_data']['reset'] %} {{ field.name }}{% if not loop.last %}, -{% endif %} -{% endfor %} - -); -{% endif %} -{# ===== End check for custom autovacuum ===== #} -{% endif %}{# ===== End block for check data definition ===== #} -{% set old_comment = o_data.comment|default('', true) %} -{% if (data.comment is defined and (data.comment != old_comment)) %} - -COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - IS {{ data.comment|qtLiteral(conn) }}; -{% endif %} -{# ============= The SQL generated below will change privileges ============= #} -{% if data.datacl %} -{% if 'deleted' in data.datacl %} -{% for priv in data.datacl.deleted %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in data.datacl %} -{% for priv in data.datacl.changed -%} -{% if priv.grantee != priv.old_grantee %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.old_grantee, data.name, data.schema) }} -{% else %} -{{ PRIVILEGE.UNSETALL(conn, 'TABLE', priv.grantee, data.name, data.schema) }} -{% endif %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{%- endfor %} -{% endif %} -{% if 'added' in data.datacl %} -{% for priv in data.datacl.added %} -{{ PRIVILEGE.SET(conn, 'TABLE', priv.grantee, data.name, priv.without_grant, priv.with_grant, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{# ============== The SQL generated below will change Security Label ========= #} -{% if data.seclabels is not none and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.UNSET(conn, 'MATERIALIZED VIEW', data.name, r.provider, data.schema) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.SET(conn, 'MATERIALIZED VIEW', data.name, r.provider, r.label, data.schema) }} -{% endfor %} -{% endif %} -{% endif %} -{% set old_exts = (o_data.dependsonextensions or []) | list %} -{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} -{% if new_exts is not none and old_exts != new_exts %} -{% for ext in (old_exts + new_exts) | unique %} - -{% if ext in new_exts and ext not in old_exts %} -ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% elif ext in old_exts and ext not in new_exts %} -ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} - NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; -{% endif %} -{% endfor %} -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/create.sql index 300b5361aff..3bea9ebfaac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/create.sql @@ -7,6 +7,11 @@ {% endif %} {% if data.name and data.schema and data.definition %} CREATE MATERIALIZED VIEW{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.schema, data.name) }} +{% if data.default_amname and data.default_amname != data.amname %} +USING {{data.amname}} +{% elif not data.default_amname and data.amname %} +USING {{data.amname}} +{% endif %} {% if(data.fillfactor or data.autovacuum_enabled in ('t', 'f') or data.toast_autovacuum_enabled in ('t', 'f') or data['vacuum_data']|length > 0) %} {% set ns = namespace(add_comma=false) %} WITH ( @@ -37,6 +42,13 @@ WITH NO DATA; ALTER TABLE IF EXISTS {{ conn|qtIdent(data.schema, data.name) }} OWNER TO {{ conn|qtIdent(data.owner) }}; {% endif %} +{% if data.dependsonextensions %} +{% for ext in data.dependsonextensions %} + +ALTER MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endfor %} +{% endif %} {% if data.comment %} COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/get_access_methods.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/get_access_methods.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/12_plus/sql/get_access_methods.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/get_access_methods.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/properties.sql index 52117c0443d..0c1113ceb0b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/properties.sql @@ -11,10 +11,18 @@ SELECT JOIN pg_catalog.pg_tablespace sp ON dtb.dattablespace=sp.oid WHERE dtb.oid = {{ did }}::oid) END as spcname, + (SELECT st.setting from pg_catalog.pg_show_all_settings() st + WHERE st.name = 'default_table_access_method') as default_amname, c.relacl, nsp.nspname as schema, pg_catalog.pg_get_userbyid(c.relowner) AS owner, description AS comment, + ( + SELECT array_agg(DISTINCT e.extname) + FROM pg_catalog.pg_depend d + JOIN pg_catalog.pg_extension e ON d.refobjid = e.oid + WHERE d.objid = c.oid + ) AS dependsonextensions, pg_catalog.pg_get_viewdef(c.oid) AS definition, {# ============= Checks if it is system view ================ #} {% if vid and datlastsysoid %} @@ -62,7 +70,7 @@ SELECT FROM 'autovacuum_freeze_max_age=([0-9]*)') AS toast_autovacuum_freeze_max_age, substring(pg_catalog.array_to_string(tst.reloptions, ',') FROM 'autovacuum_freeze_table_age=([0-9]*)') AS toast_autovacuum_freeze_table_age, - c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, + c.reloptions AS reloptions, tst.reloptions AS toast_reloptions, am.amname, (CASE WHEN c.reltoastrelid = 0 THEN false ELSE true END) AS hastoasttable FROM pg_catalog.pg_class c @@ -70,6 +78,7 @@ LEFT OUTER JOIN pg_catalog.pg_namespace nsp on nsp.oid = c.relnamespace LEFT OUTER JOIN pg_catalog.pg_tablespace spc on spc.oid=c.reltablespace LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=c.oid and des.objsubid=0 AND des.classoid='pg_class'::regclass) LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = c.reltoastrelid +LEFT OUTER JOIN pg_catalog.pg_am am ON am.oid = c.relam WHERE ((c.relhasrules AND (EXISTS ( SELECT r.rulename diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/update.sql index a9c742de75b..840135c546d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/default/sql/update.sql @@ -27,6 +27,9 @@ ALTER TABLE IF EXISTS {{ conn|qtIdent(view_schema, view_name) }} {% if def and def != o_data.definition.rstrip(';') %} DROP MATERIALIZED VIEW IF EXISTS {{ conn|qtIdent(view_schema, view_name) }}; CREATE MATERIALIZED VIEW IF NOT EXISTS {{ conn|qtIdent(view_schema, view_name) }} +{% if data.amname and data.amname != o_data.amname %} +USING {{ data.amname }} +{% endif %} {% if data.fillfactor or o_data.fillfactor %} WITH( {% if data.fillfactor %} @@ -201,4 +204,18 @@ COMMENT ON MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} {% endfor %} {% endif %} {% endif %} +{% set old_exts = (o_data.dependsonextensions or []) | list %} +{% set new_exts = data.dependsonextensions if 'dependsonextensions' in data else None %} +{% if new_exts is not none and old_exts != new_exts %} +{% for ext in (old_exts + new_exts) | unique %} + +{% if ext in new_exts and ext not in old_exts %} +ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} + DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% elif ext in old_exts and ext not in new_exts %} +ALTER MATERIALIZED VIEW {{ conn|qtIdent(view_schema, view_name) }} + NO DEPENDS ON EXTENSION {{ conn|qtIdent(ext) }}; +{% endif %} +{% endfor %} +{% endif %} {% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/test_mview.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/test_mview.json deleted file mode 100644 index f1666e30751..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/test_mview.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Materialised Views", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1" - }, - "expected_sql_file": "create_mview.sql", - "expected_msql_file": "create_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Adding privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview.sql", - "expected_msql_file": "alter_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Remove all privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_drop_all_priv.sql", - "expected_msql_file": "alter_mview_drop_all_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change grantee in privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_change_grantee_priv.sql", - "expected_msql_file": "alter_mview_change_grantee_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change definition)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "definition": "SELECT 12 AS col1;" - }, - "expected_sql_file": "alter_mview_definition.sql", - "expected_msql_file": "alter_mview_definition_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Fillfactor)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "fillfactor": "18", - "with_data": true - }, - "expected_sql_file": "alter_mview_add_fillfactor.sql", - "expected_msql_file": "alter_mview_add_fillfactor_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (add table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "t", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - } - ] - } - }, - "expected_sql_file": "alter_mview_add_table_parameter.sql", - "expected_msql_file": "alter_mview_add_table_parameter_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (remove table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "x", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": null - } - ] - } - }, - "expected_sql_file": "alter_mview_remove_table_parameter.sql", - "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" - }, - { - "type": "create", - "name": "Create Materialised Views with access method", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "", - "datacl": [], - "seclabels": [], - "name": "testmview_am_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1", - "amname": "heap" - }, - "expected_msql_file": "create_mview_with_am_msql.sql", - "expected_sql_file": "create_mview_with_am.sql" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/tests.json deleted file mode 100644 index 83395eb5c8f..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/tests.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for Views", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_view_table", - "check_constraint": [], - "coll_inherits": "[]", - "columns": [ - { - "name": "col1", - "cltype": "integer" - } - ], - "schema": "public" - } - }, - { - "type": "create", - "name": "Create View", - "endpoint": "NODE-view.obj", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql", - "data": { - "definition": "select col1 from test_view_table;", - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public", - "check_option": "local", - "security_barrier": false, - "comment": "Testcomment", - "datacl": [ - { - "grantee": "", - "old_grantee": "", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - } - ] - } - ] - }, - "expected_sql_file": "create_view.sql", - "expected_msql_file": "create_view_msql.sql" - }, - { - "type": "alter", - "name": "Alter View", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment": "Testcomment-updated", - "datacl": [ - { - "grantee": "", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - } - ] - } - ] - }, - "expected_sql_file": "alter_view.sql", - "expected_msql_file": "alter_view_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (changing code)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "definition": "SELECT * FROM test_view_table;" - }, - "expected_sql_file": "alter_view_definition.sql", - "expected_msql_file": "alter_view_definition_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (adding privileges)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment": "Testcomment-updated", - "datacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_view_add_some_priv.sql", - "expected_msql_file": "alter_view_add_some_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (deleting privileges (PUBLIC))", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment": "Testcomment-updated", - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter View (changing privileges (postgres to PUBLIC))", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment": "Testcomment-updated", - "datacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_view_update_priv.sql", - "expected_msql_file": "alter_view_update_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (deleting privileges)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment": "Testcomment-updated", - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_view_delete_priv.sql", - "expected_msql_file": "alter_view_delete_priv_msql.sql" - }, - { - "type": "delete", - "name": "Drop View", - "endpoint": "NODE-view.obj_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "", - "schema": "public" - } - }, - { - "type": "delete", - "name": "Drop Table for view", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "test_view_table", - "owner": "", - "schema": "public" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/test_mview.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/test_mview.json deleted file mode 100644 index b364b449349..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/test_mview.json +++ /dev/null @@ -1,345 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Materialised Views with extensions.", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1", - "dependsonextensions": [ - "plpgsql", - "postgres_fdw" - ] - }, - "expected_sql_file": "create_mview_no_depends.sql", - "expected_msql_file": "create_mview_no_depends.msql" - }, - { - "type": "alter", - "name": "Alter Materialised Views with NO DEPENDS ON", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "dependsonextensions": [ - "plpgsql" - ] - }, - "expected_sql_file": "alter_mview_no_depends.sql", - "expected_msql_file": "alter_mview_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop Materialised Views", - "endpoint": "NODE-mview.delete_id", - "data": {} - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [ - "" - ] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create Materialised Views", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1" - }, - "expected_sql_file": "create_mview.sql", - "expected_msql_file": "create_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Adding privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview.sql", - "expected_msql_file": "alter_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Remove all privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_drop_all_priv.sql", - "expected_msql_file": "alter_mview_drop_all_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change grantee in privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "", - "old_grantee": "", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_change_grantee_priv.sql", - "expected_msql_file": "alter_mview_change_grantee_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change definition)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "definition": "SELECT 12 AS col1;" - }, - "expected_sql_file": "alter_mview_definition.sql", - "expected_msql_file": "alter_mview_definition_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Fillfactor)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "fillfactor": "18", - "with_data": true - }, - "expected_sql_file": "alter_mview_add_fillfactor.sql", - "expected_msql_file": "alter_mview_add_fillfactor_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (add table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "t", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - } - ] - } - }, - "expected_sql_file": "alter_mview_add_table_parameter.sql", - "expected_msql_file": "alter_mview_add_table_parameter_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (remove table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "x", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": null - } - ] - } - }, - "expected_sql_file": "alter_mview_remove_table_parameter.sql", - "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" - }, - { - "type": "create", - "name": "Create Materialised Views with access method", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "", - "datacl": [], - "seclabels": [], - "name": "testmview_am_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1", - "amname": "heap" - }, - "expected_msql_file": "create_mview_with_am_msql.sql", - "expected_sql_file": "create_mview_with_am.sql" - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/alter_mview_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/alter_mview_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/alter_mview_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/alter_mview_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/create_mview_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/create_mview_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/create_mview_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/13_plus/create_mview_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/create_mview_with_am.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_with_am.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/create_mview_with_am.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_with_am.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/create_mview_with_am_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_with_am_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/12_plus/create_mview_with_am_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/create_mview_with_am_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/test_mview.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/test_mview.json index 6abd567dfbd..b364b449349 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/test_mview.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/test_mview.json @@ -1,5 +1,71 @@ { "scenarios": [ + { + "type": "create", + "name": "Create Extension", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "postgres_fdw", + "version": "", + "relocatable": true + }, + "store_object_id": true + }, + { + "type": "create", + "name": "Create Materialised Views with extensions.", + "endpoint": "NODE-mview.obj", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql", + "data": { + "spcname": "pg_default", + "schema": "public", + "owner": "", + "datacl": [], + "seclabels": [], + "name": "testmview_$%{}[]()&*^!/@`#", + "comment": "comment1", + "definition": "SELECT 1 AS col1", + "dependsonextensions": [ + "plpgsql", + "postgres_fdw" + ] + }, + "expected_sql_file": "create_mview_no_depends.sql", + "expected_msql_file": "create_mview_no_depends.msql" + }, + { + "type": "alter", + "name": "Alter Materialised Views with NO DEPENDS ON", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "dependsonextensions": [ + "plpgsql" + ] + }, + "expected_sql_file": "alter_mview_no_depends.sql", + "expected_msql_file": "alter_mview_no_depends.msql" + }, + { + "type": "delete", + "name": "Drop Materialised Views", + "endpoint": "NODE-mview.delete_id", + "data": {} + }, + { + "type": "delete", + "name": "Drop Extension", + "endpoint": "NODE-extension.delete", + "data": { + "ids": [ + "" + ] + }, + "preprocess_data": true + }, { "type": "create", "name": "Create Materialised Views", @@ -254,6 +320,26 @@ }, "expected_sql_file": "alter_mview_remove_table_parameter.sql", "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" + }, + { + "type": "create", + "name": "Create Materialised Views with access method", + "endpoint": "NODE-mview.obj", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql", + "data": { + "spcname": "pg_default", + "schema": "public", + "owner": "", + "datacl": [], + "seclabels": [], + "name": "testmview_am_$%{}[]()&*^!/@`#", + "comment": "comment1", + "definition": "SELECT 1 AS col1", + "amname": "heap" + }, + "expected_msql_file": "create_mview_with_am_msql.sql", + "expected_sql_file": "create_mview_with_am.sql" } ] } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/test_mview.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/test_mview.json deleted file mode 100644 index 2dc012bf264..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/test_mview.json +++ /dev/null @@ -1,280 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Materialised Views", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "enterprisedb", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1" - }, - "expected_sql_file": "create_mview.sql", - "expected_msql_file": "create_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Adding privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview.sql", - "expected_msql_file": "alter_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Remove all privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_drop_all_priv.sql", - "expected_msql_file": "alter_mview_drop_all_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change grantee in privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_change_grantee_priv.sql", - "expected_msql_file": "alter_mview_change_grantee_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change definition)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "definition": "SELECT 12 AS col1;" - }, - "expected_sql_file": "alter_mview_definition.sql", - "expected_msql_file": "alter_mview_definition_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Fillfactor)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "fillfactor": "18", - "with_data": true - }, - "expected_sql_file": "alter_mview_add_fillfactor.sql", - "expected_msql_file": "alter_mview_add_fillfactor_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (add table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "t", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - } - ] - } - }, - "expected_sql_file": "alter_mview_add_table_parameter.sql", - "expected_msql_file": "alter_mview_add_table_parameter_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (remove table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "x", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": null - } - ] - } - }, - "expected_sql_file": "alter_mview_remove_table_parameter.sql", - "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" - }, - { - "type": "create", - "name": "Create Materialised Views with access method", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "enterprisedb", - "datacl": [], - "seclabels": [], - "name": "testmview_am_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1", - "amname": "heap" - }, - "expected_msql_file": "create_mview_with_am_msql.sql", - "expected_sql_file": "create_mview_with_am.sql" - } - ] - } - \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/tests.json deleted file mode 100644 index 312b25ab30a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/tests.json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Table for Views", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_view_table", - "check_constraint": [], - "coll_inherits": "[]", - "columns": [ - { - "name": "col1", - "cltype": "integer" - } - ], - "schema": "public" - } - }, - { - "type": "create", - "name": "Create View", - "endpoint": "NODE-view.obj", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql", - "data": { - "definition": "select col1 from test_view_table;", - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "local", - "security_barrier": false, - "comment":"Testcomment", - "datacl":[{"grantee":"enterprisedb", "grantor":"enterprisedb", "privileges":[{"privilege_type": "a", "privilege": true, - "with_grant":false}]}] - }, - "expected_sql_file": "create_view.sql", - "expected_msql_file": "create_view_msql.sql" - }, - { - "type": "alter", - "name": "Alter View", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl":[{"grantee":"enterprisedb", "grantor":"enterprisedb", "privileges":[{"privilege_type": "a", "privilege": true, - "with_grant":false}]}] - }, - "expected_sql_file": "alter_view.sql", - "expected_msql_file": "alter_view_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (adding privileges)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "datacl":{ - "added":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_view_add_some_priv.sql", - "expected_msql_file": "alter_view_add_some_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (deleting privileges (PUBLIC))", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl": - { - "deleted":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter View (changing privileges (enterprisedb to PUBLIC))", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl": - { - "changed":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "old_grantee": "enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_view_update_priv.sql", - "expected_msql_file": "alter_view_update_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (deleting privileges)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl": - { - "deleted":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_view_delete_priv.sql", - "expected_msql_file": "alter_view_delete_priv_msql.sql" - }, - { - "type": "delete", - "name": "Drop View", - "endpoint": "NODE-view.obj_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public" - } - }, - { - "type": "delete", - "name": "Drop Table for view", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "test_view_table", - "owner": "enterprisedb", - "schema": "public" - } - } - ] - } - \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/test_mview.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/test_mview.json deleted file mode 100644 index f73dd28fd21..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/test_mview.json +++ /dev/null @@ -1,340 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Extension", - "endpoint": "NODE-extension.obj", - "sql_endpoint": "NODE-extension.sql_id", - "data": { - "name": "postgres_fdw", - "version": "", - "relocatable": true - }, - "store_object_id": true - }, - { - "type": "create", - "name": "Create Materialised Views with extensions.", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "enterprisedb", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1", - "dependsonextensions": ["plpgsql", "postgres_fdw"] - }, - "expected_sql_file": "create_mview_no_depends.sql", - "expected_msql_file": "create_mview_no_depends.msql" - }, - { - "type": "alter", - "name": "Alter Materialised Views with NO DEPENDS ON.", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "dependsonextensions": ["plpgsql"] - }, - "expected_sql_file": "alter_mview_no_depends.sql", - "expected_msql_file": "alter_mview_no_depends.msql" - }, - { - "type": "delete", - "name": "Drop Materialised Views", - "endpoint": "NODE-mview.delete_id", - "data": { - } - }, - { - "type": "delete", - "name": "Drop Extension", - "endpoint": "NODE-extension.delete", - "data": { - "ids": [""] - }, - "preprocess_data": true - }, - { - "type": "create", - "name": "Create Materialised Views", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "enterprisedb", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1" - }, - "expected_sql_file": "create_mview.sql", - "expected_msql_file": "create_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Adding privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview.sql", - "expected_msql_file": "alter_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Remove all privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_drop_all_priv.sql", - "expected_msql_file": "alter_mview_drop_all_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change grantee in privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } - }, - "expected_sql_file": "alter_mview_change_grantee_priv.sql", - "expected_msql_file": "alter_mview_change_grantee_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change definition)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "definition": "SELECT 12 AS col1;" - }, - "expected_sql_file": "alter_mview_definition.sql", - "expected_msql_file": "alter_mview_definition_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Fillfactor)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "fillfactor": "18", - "with_data": true - }, - "expected_sql_file": "alter_mview_add_fillfactor.sql", - "expected_msql_file": "alter_mview_add_fillfactor_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (add table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "t", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - } - ] - } - }, - "expected_sql_file": "alter_mview_add_table_parameter.sql", - "expected_msql_file": "alter_mview_add_table_parameter_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (remove table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "x", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": null - } - ] - } - }, - "expected_sql_file": "alter_mview_remove_table_parameter.sql", - "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" - }, - { - "type": "create", - "name": "Create Materialised Views with access method", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "enterprisedb", - "datacl": [], - "seclabels": [], - "name": "testmview_am_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1", - "amname": "heap" - }, - "expected_msql_file": "create_mview_with_am_msql.sql", - "expected_sql_file": "create_mview_with_am.sql" - } - ] - } - \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/alter_mview_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/alter_mview_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/alter_mview_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/alter_mview_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/alter_mview_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/alter_mview_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/alter_mview_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/alter_mview_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/create_mview_no_depends.msql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_no_depends.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/create_mview_no_depends.msql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_no_depends.msql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/create_mview_no_depends.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_no_depends.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/13_plus/create_mview_no_depends.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_no_depends.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/create_mview_with_am.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_with_am.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/create_mview_with_am.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_with_am.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/create_mview_with_am_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_with_am_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/12_plus/create_mview_with_am_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/create_mview_with_am_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/test_mview.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/test_mview.json index aacf621065b..f73dd28fd21 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/test_mview.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/test_mview.json @@ -1,259 +1,340 @@ { - "scenarios": [ - { - "type": "create", - "name": "Create Materialised Views", - "endpoint": "NODE-mview.obj", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql", - "data": { - "spcname": "pg_default", - "schema": "public", - "owner": "enterprisedb", - "datacl": [], - "seclabels": [], - "name": "testmview_$%{}[]()&*^!/@`#", - "comment": "comment1", - "definition": "SELECT 1 AS col1" + "scenarios": [ + { + "type": "create", + "name": "Create Extension", + "endpoint": "NODE-extension.obj", + "sql_endpoint": "NODE-extension.sql_id", + "data": { + "name": "postgres_fdw", + "version": "", + "relocatable": true + }, + "store_object_id": true }, - "expected_sql_file": "create_mview.sql", - "expected_msql_file": "create_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Adding privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "added": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } + { + "type": "create", + "name": "Create Materialised Views with extensions.", + "endpoint": "NODE-mview.obj", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql", + "data": { + "spcname": "pg_default", + "schema": "public", + "owner": "enterprisedb", + "datacl": [], + "seclabels": [], + "name": "testmview_$%{}[]()&*^!/@`#", + "comment": "comment1", + "definition": "SELECT 1 AS col1", + "dependsonextensions": ["plpgsql", "postgres_fdw"] + }, + "expected_sql_file": "create_mview_no_depends.sql", + "expected_msql_file": "create_mview_no_depends.msql" }, - "expected_sql_file": "alter_mview.sql", - "expected_msql_file": "alter_mview_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Remove all privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "deleted": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] - } + { + "type": "alter", + "name": "Alter Materialised Views with NO DEPENDS ON.", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "dependsonextensions": ["plpgsql"] + }, + "expected_sql_file": "alter_mview_no_depends.sql", + "expected_msql_file": "alter_mview_no_depends.msql" }, - "expected_sql_file": "alter_mview_drop_all_priv.sql", - "expected_msql_file": "alter_mview_drop_all_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change grantee in privileges)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "datacl": { - "changed": [ - { - "grantee": "PUBLIC", - "grantor": "enterprisedb", - "old_grantee": "enterprisedb", - "privileges": [ - { - "privilege_type": "a", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "r", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "w", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "d", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "D", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "x", - "privilege": true, - "with_grant": false - }, - { - "privilege_type": "t", - "privilege": true, - "with_grant": false - } - ] - } - ] + { + "type": "delete", + "name": "Drop Materialised Views", + "endpoint": "NODE-mview.delete_id", + "data": { } + }, + { + "type": "delete", + "name": "Drop Extension", + "endpoint": "NODE-extension.delete", + "data": { + "ids": [""] + }, + "preprocess_data": true }, - "expected_sql_file": "alter_mview_change_grantee_priv.sql", - "expected_msql_file": "alter_mview_change_grantee_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (change definition)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "definition": "SELECT 12 AS col1;" + { + "type": "create", + "name": "Create Materialised Views", + "endpoint": "NODE-mview.obj", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql", + "data": { + "spcname": "pg_default", + "schema": "public", + "owner": "enterprisedb", + "datacl": [], + "seclabels": [], + "name": "testmview_$%{}[]()&*^!/@`#", + "comment": "comment1", + "definition": "SELECT 1 AS col1" + }, + "expected_sql_file": "create_mview.sql", + "expected_msql_file": "create_mview_msql.sql" }, - "expected_sql_file": "alter_mview_definition.sql", - "expected_msql_file": "alter_mview_definition_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (Fillfactor)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "fillfactor": "18", - "with_data": true + { + "type": "alter", + "name": "Alter Materialised Views (Adding privileges)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "datacl": { + "added": [ + { + "grantee": "PUBLIC", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "w", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "d", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "D", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "t", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_mview.sql", + "expected_msql_file": "alter_mview_msql.sql" }, - "expected_sql_file": "alter_mview_add_fillfactor.sql", - "expected_msql_file": "alter_mview_add_fillfactor_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (add table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "t", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": 0.2 - } - ] - } + { + "type": "alter", + "name": "Alter Materialised Views (Remove all privileges)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "datacl": { + "deleted": [ + { + "grantee": "PUBLIC", + "grantor": "enterprisedb", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "w", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "d", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "D", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "t", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_mview_drop_all_priv.sql", + "expected_msql_file": "alter_mview_drop_all_priv_msql.sql" }, - "expected_sql_file": "alter_mview_add_table_parameter.sql", - "expected_msql_file": "alter_mview_add_table_parameter_msql.sql" - }, - { - "type": "alter", - "name": "Alter Materialised Views (remove table parameters)", - "endpoint": "NODE-mview.obj_id", - "sql_endpoint": "NODE-mview.sql_id", - "msql_endpoint": "NODE-mview.msql_id", - "data": { - "autovacuum_custom": true, - "autovacuum_enabled": "x", - "vacuum_table": { - "changed": [ - { - "name": "autovacuum_analyze_scale_factor", - "value": null - } - ] - } + { + "type": "alter", + "name": "Alter Materialised Views (change grantee in privileges)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "datacl": { + "changed": [ + { + "grantee": "PUBLIC", + "grantor": "enterprisedb", + "old_grantee": "enterprisedb", + "privileges": [ + { + "privilege_type": "a", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "r", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "w", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "d", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "D", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "x", + "privilege": true, + "with_grant": false + }, + { + "privilege_type": "t", + "privilege": true, + "with_grant": false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_mview_change_grantee_priv.sql", + "expected_msql_file": "alter_mview_change_grantee_priv_msql.sql" + }, + { + "type": "alter", + "name": "Alter Materialised Views (change definition)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "definition": "SELECT 12 AS col1;" + }, + "expected_sql_file": "alter_mview_definition.sql", + "expected_msql_file": "alter_mview_definition_msql.sql" + }, + { + "type": "alter", + "name": "Alter Materialised Views (Fillfactor)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "fillfactor": "18", + "with_data": true + }, + "expected_sql_file": "alter_mview_add_fillfactor.sql", + "expected_msql_file": "alter_mview_add_fillfactor_msql.sql" + }, + { + "type": "alter", + "name": "Alter Materialised Views (add table parameters)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "autovacuum_custom": true, + "autovacuum_enabled": "t", + "vacuum_table": { + "changed": [ + { + "name": "autovacuum_analyze_scale_factor", + "value": 0.2 + } + ] + } + }, + "expected_sql_file": "alter_mview_add_table_parameter.sql", + "expected_msql_file": "alter_mview_add_table_parameter_msql.sql" + }, + { + "type": "alter", + "name": "Alter Materialised Views (remove table parameters)", + "endpoint": "NODE-mview.obj_id", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql_id", + "data": { + "autovacuum_custom": true, + "autovacuum_enabled": "x", + "vacuum_table": { + "changed": [ + { + "name": "autovacuum_analyze_scale_factor", + "value": null + } + ] + } + }, + "expected_sql_file": "alter_mview_remove_table_parameter.sql", + "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" }, - "expected_sql_file": "alter_mview_remove_table_parameter.sql", - "expected_msql_file": "alter_mview_remove_table_parameter_msql.sql" - } - ] -} + { + "type": "create", + "name": "Create Materialised Views with access method", + "endpoint": "NODE-mview.obj", + "sql_endpoint": "NODE-mview.sql_id", + "msql_endpoint": "NODE-mview.msql", + "data": { + "spcname": "pg_default", + "schema": "public", + "owner": "enterprisedb", + "datacl": [], + "seclabels": [], + "name": "testmview_am_$%{}[]()&*^!/@`#", + "comment": "comment1", + "definition": "SELECT 1 AS col1", + "amname": "heap" + }, + "expected_msql_file": "create_mview_with_am_msql.sql", + "expected_sql_file": "create_mview_with_am.sql" + } + ] + } + \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/tests.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/tests.json index 7e311ed96d8..312b25ab30a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/tests.json +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/default/tests.json @@ -1,205 +1,206 @@ { - "scenarios": [ - { - "type": "create", - "name": "Create Table for Views", - "endpoint": "NODE-table.obj", - "sql_endpoint": "NODE-table.sql_id", - "data": { - "name": "test_view_table", - "check_constraint": [], - "coll_inherits": "[]", - "columns": [ - { - "name": "col1", - "cltype": "integer" - } - ], - "schema": "public" - } - }, - { - "type": "create", - "name": "Create View", - "endpoint": "NODE-view.obj", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql", - "data": { - "definition": "select col1 from test_view_table;", - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "local", - "security_barrier": false, - "comment":"Testcomment", - "datacl":[{"grantee":"enterprisedb", "grantor":"enterprisedb", "privileges":[{"privilege_type": "a", "privilege": true, - "with_grant":false}]}] + "scenarios": [ + { + "type": "create", + "name": "Create Table for Views", + "endpoint": "NODE-table.obj", + "sql_endpoint": "NODE-table.sql_id", + "data": { + "name": "test_view_table", + "check_constraint": [], + "coll_inherits": "[]", + "columns": [ + { + "name": "col1", + "cltype": "integer" + } + ], + "schema": "public" + } + }, + { + "type": "create", + "name": "Create View", + "endpoint": "NODE-view.obj", + "sql_endpoint": "NODE-view.sql_id", + "msql_endpoint": "NODE-view.msql", + "data": { + "definition": "select col1 from test_view_table;", + "name": "testview_$%{}[]()&*^!@\"'`\\/#", + "owner": "enterprisedb", + "schema": "public", + "check_option": "local", + "security_barrier": false, + "comment":"Testcomment", + "datacl":[{"grantee":"enterprisedb", "grantor":"enterprisedb", "privileges":[{"privilege_type": "a", "privilege": true, + "with_grant":false}]}] + }, + "expected_sql_file": "create_view.sql", + "expected_msql_file": "create_view_msql.sql" + }, + { + "type": "alter", + "name": "Alter View", + "endpoint": "NODE-view.obj_id", + "sql_endpoint": "NODE-view.sql_id", + "msql_endpoint": "NODE-view.msql_id", + "data": { + "name": "testview_$%{}[]()&*^!@\"'`\\/#", + "owner": "enterprisedb", + "schema": "public", + "check_option": "cascaded", + "security_barrier": true, + "comment":"Testcomment-updated", + "datacl":[{"grantee":"enterprisedb", "grantor":"enterprisedb", "privileges":[{"privilege_type": "a", "privilege": true, + "with_grant":false}]}] + }, + "expected_sql_file": "alter_view.sql", + "expected_msql_file": "alter_view_msql.sql" }, - "expected_sql_file": "create_view.sql", - "expected_msql_file": "create_view_msql.sql" - }, - { - "type": "alter", - "name": "Alter View", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl":[{"grantee":"enterprisedb", "grantor":"enterprisedb", "privileges":[{"privilege_type": "a", "privilege": true, - "with_grant":false}]}] + { + "type": "alter", + "name": "Alter View (adding privileges)", + "endpoint": "NODE-view.obj_id", + "sql_endpoint": "NODE-view.sql_id", + "msql_endpoint": "NODE-view.msql_id", + "data": { + "datacl":{ + "added":[ + { + "grantee":"PUBLIC", + "grantor":"enterprisedb", + "privileges":[ + { + "privilege_type":"r", + "privilege":true, + "with_grant":false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_view_add_some_priv.sql", + "expected_msql_file": "alter_view_add_some_priv_msql.sql" }, - "expected_sql_file": "alter_view.sql", - "expected_msql_file": "alter_view_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (adding privileges)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "datacl":{ - "added":[ + { + "type": "alter", + "name": "Alter View (deleting privileges (PUBLIC))", + "endpoint": "NODE-view.obj_id", + "sql_endpoint": "NODE-view.sql_id", + "msql_endpoint": "NODE-view.msql_id", + "data": { + "name": "testview_$%{}[]()&*^!@\"'`\\/#", + "owner": "enterprisedb", + "schema": "public", + "check_option": "cascaded", + "security_barrier": true, + "comment":"Testcomment-updated", + "datacl": + { + "deleted":[ { "grantee":"PUBLIC", "grantor":"enterprisedb", "privileges":[ { - "privilege_type":"r", - "privilege":true, - "with_grant":false + "privilege_type":"r", + "privilege":true, + "with_grant":false } ] } - ] + ] + } } }, - "expected_sql_file": "alter_view_add_some_priv.sql", - "expected_msql_file": "alter_view_add_some_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (deleting privileges (PUBLIC))", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl": - { - "deleted":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } - } - }, - { - "type": "alter", - "name": "Alter View (changing privileges (enterprisedb to PUBLIC))", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl": - { - "changed":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "old_grantee": "enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } + { + "type": "alter", + "name": "Alter View (changing privileges (enterprisedb to PUBLIC))", + "endpoint": "NODE-view.obj_id", + "sql_endpoint": "NODE-view.sql_id", + "msql_endpoint": "NODE-view.msql_id", + "data": { + "name": "testview_$%{}[]()&*^!@\"'`\\/#", + "owner": "enterprisedb", + "schema": "public", + "check_option": "cascaded", + "security_barrier": true, + "comment":"Testcomment-updated", + "datacl": + { + "changed":[ + { + "grantee":"PUBLIC", + "grantor":"enterprisedb", + "old_grantee": "enterprisedb", + "privileges":[ + { + "privilege_type":"r", + "privilege":true, + "with_grant":false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_view_update_priv.sql", + "expected_msql_file": "alter_view_update_priv_msql.sql" }, - "expected_sql_file": "alter_view_update_priv.sql", - "expected_msql_file": "alter_view_update_priv_msql.sql" - }, - { - "type": "alter", - "name": "Alter View (deleting privileges)", - "endpoint": "NODE-view.obj_id", - "sql_endpoint": "NODE-view.sql_id", - "msql_endpoint": "NODE-view.msql_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public", - "check_option": "cascaded", - "security_barrier": true, - "comment":"Testcomment-updated", - "datacl": - { - "deleted":[ - { - "grantee":"PUBLIC", - "grantor":"enterprisedb", - "privileges":[ - { - "privilege_type":"r", - "privilege":true, - "with_grant":false - } - ] - } - ] - } + { + "type": "alter", + "name": "Alter View (deleting privileges)", + "endpoint": "NODE-view.obj_id", + "sql_endpoint": "NODE-view.sql_id", + "msql_endpoint": "NODE-view.msql_id", + "data": { + "name": "testview_$%{}[]()&*^!@\"'`\\/#", + "owner": "enterprisedb", + "schema": "public", + "check_option": "cascaded", + "security_barrier": true, + "comment":"Testcomment-updated", + "datacl": + { + "deleted":[ + { + "grantee":"PUBLIC", + "grantor":"enterprisedb", + "privileges":[ + { + "privilege_type":"r", + "privilege":true, + "with_grant":false + } + ] + } + ] + } + }, + "expected_sql_file": "alter_view_delete_priv.sql", + "expected_msql_file": "alter_view_delete_priv_msql.sql" }, - "expected_sql_file": "alter_view_delete_priv.sql", - "expected_msql_file": "alter_view_delete_priv_msql.sql" - }, - { - "type": "delete", - "name": "Drop View", - "endpoint": "NODE-view.obj_id", - "data": { - "name": "testview_$%{}[]()&*^!@\"'`\\/#", - "owner": "enterprisedb", - "schema": "public" - } - }, - { - "type": "delete", - "name": "Drop Table for view", - "endpoint": "NODE-table.obj_id", - "data": { - "name": "test_view_table", - "owner": "enterprisedb", - "schema": "public" + { + "type": "delete", + "name": "Drop View", + "endpoint": "NODE-view.obj_id", + "data": { + "name": "testview_$%{}[]()&*^!@\"'`\\/#", + "owner": "enterprisedb", + "schema": "public" + } + }, + { + "type": "delete", + "name": "Drop Table for view", + "endpoint": "NODE-table.obj_id", + "data": { + "name": "test_view_table", + "owner": "enterprisedb", + "schema": "public" + } } - } - ] -} + ] + } + \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/create.sql deleted file mode 100644 index 154d602df58..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/create.sql +++ /dev/null @@ -1,24 +0,0 @@ -{% if data.copy_data is defined or data.create_slot is defined or data.slot_name is defined or data.sync is defined %} -{% set add_semicolon_after_enabled = 'enabled' %} -{% endif %} -{% if data.create_slot is defined or data.slot_name is defined %} -{% set add_semicolon_after_copy_data = 'copy_data' %} -{% endif %} -{% if data.slot_name is defined or data.sync is defined %} -{% set add_semicolon_after_create_slot = 'create_slot' %} -{% endif %} -{% if data.sync is defined %} -{% set add_semicolon_after_slot_name = 'slot_name' %} -{% endif %} - -CREATE SUBSCRIPTION {{ conn|qtIdent(data.name) }} -{% if data.host or data.port or data.username or data.password or data.db or data.connect_timeout or data.passfile or data.sslmode or data.sslcompression or data.sslcert or data.sslkey or data.sslrootcert or data.sslcrl%} - CONNECTION '{% if data.host %}host={{data.host}}{% endif %}{% if data.port %} port={{ data.port }}{% endif %}{% if data.username %} user={{ data.username }}{% endif %}{% if data.db %} dbname={{ data.db }}{% endif %}{% if data.connect_timeout %} connect_timeout={{ data.connect_timeout }}{% endif %}{% if data.passfile %} passfile={{ data.passfile }}{% endif %}{% if data.password %} {% if dummy %}password=xxxxxx{% else %}password={{ data.password}}{% endif %}{% endif %}{% if data.sslmode %} sslmode={{ data.sslmode }}{% endif %}{% if data.sslcompression %} sslcompression={{ data.sslcompression }}{% endif %}{% if data.sslcert %} sslcert={{ data.sslcert }}{% endif %}{% if data.sslkey %} sslkey={{ data.sslkey }}{% endif %}{% if data.sslrootcert %} sslrootcert={{ data.sslrootcert }}{% endif %}{% if data.sslcrl %} sslcrl={{ data.sslcrl }}{% endif %}' -{% endif %} -{% if data.pub %} - PUBLICATION {% for pub in data.pub %}{% if loop.index != 1 %},{% endif %}{{ conn|qtIdent(pub) }}{% endfor %} -{% endif %} - - WITH ({% if data.connect is defined %}connect = {{ data.connect|lower}}, {% endif %}enabled = {{ data.enabled|lower}}, {% if data.copy_data is defined %}copy_data = {{ data.copy_data|lower}}{% if add_semicolon_after_copy_data == 'copy_data' %}, {% endif %}{% endif %} -{% if data.create_slot is defined %}create_slot = {{ data.create_slot|lower }}{% if add_semicolon_after_create_slot == 'create_slot' %}, {% endif %}{% endif %} -{% if data.slot_name is defined and data.slot_name != ''%}slot_name = {{ data.slot_name }}{% if add_semicolon_after_slot_name == 'slot_name' %}, {% endif %}{% endif %}{% if data.sync %}synchronous_commit = '{{ data.sync }}', {% endif %}binary = {{ data.binary|lower}}, streaming = '{{ data.streaming}}'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/properties.sql deleted file mode 100644 index e78722cd0a4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/properties.sql +++ /dev/null @@ -1,29 +0,0 @@ -SELECT sub.oid as oid, - subname as name, - subpublications as pub, - subpublications as proppub, - sub.subsynccommit as sync, - pga.rolname as subowner, - subslotname as slot_name, - subenabled as enabled, - subbinary as binary, - substream as streaming, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,' port',1), '=',2) as host, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'port=',2), ' ',1) as port, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'user=',2), ' ',1) as username, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'dbname=',2), ' ',1) as db, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'connect_timeout=',2), ' ',1) as connect_timeout, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'passfile=',2), ' ',1) as passfile, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'sslmode=',2), ' ',1) as sslmode, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'sslcompression=',2), ' ',1) as sslcompression, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'sslcert=',2), ' ',1) as sslcert, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'sslkey=',2), ' ',1) as sslkey, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'sslrootcert=',2), ' ',1) as sslrootcert, - pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'sslcrl=',2), ' ',1) as sslcrl -FROM pg_catalog.pg_subscription sub join pg_catalog.pg_roles pga on sub.subowner= pga.oid -WHERE -{% if subid %} - sub.oid = {{ subid }}; -{% else %} - sub.subdbid = {{ did }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/update.sql deleted file mode 100644 index fbc647cfb36..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/14_plus/update.sql +++ /dev/null @@ -1,65 +0,0 @@ -{% if data.sync is defined %} -{% set add_comma_after_slot_name = 'slot_name' %} -{% endif %} -{% if data.binary is defined or data.streaming is defined %} -{% set add_comma_after_sync = 'sync' %} -{% endif %} -{% if data.streaming is defined %} -{% set add_comma_after_binary = 'binary' %} -{% endif %} -{#####################################################} -{## Change owner of subscription ##} -{#####################################################} -{% if data.subowner and data.subowner != o_data.subowner %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - OWNER TO {{ data.subowner }}; - -{% endif %} -{### Disable subscription ###} -{% if data.enabled is defined and data.enabled != o_data.enabled %} -{% if not data.enabled %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} DISABLE; -{% endif %} - -{% endif %} -{### Alter parameters of subscription ###} -{% if (data.slot_name is defined and data.slot_name != o_data.slot_name) or (data.sync is defined and data.sync != o_data.sync) or (data.binary is defined and data.binary!=o_data.binary) or (data.streaming is defined and data.streaming!=o_data.streaming) %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - SET ({% if data.slot_name is defined and data.slot_name != o_data.slot_name %}slot_name = {{ data.slot_name }}{% if add_comma_after_slot_name == 'slot_name' %}, {% endif %}{% endif %}{% if data.sync is defined and data.sync != o_data.sync %}synchronous_commit = '{{ data.sync }}'{% if add_comma_after_sync == 'sync' %}, {% endif %}{% endif %}{% if data.binary is defined and data.binary!=o_data.binary %}binary = {{ data.binary|lower}}{% if add_comma_after_binary == 'binary' %}, {% endif %}{% endif %}{% if data.streaming is defined and data.streaming!=o_data.streaming %}streaming = '{{ data.streaming}}'{% endif %}); - -{% endif %} -{### Enable subscription ###} -{% if data.enabled is defined and data.enabled != o_data.enabled %} -{% if data.enabled %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} ENABLE; -{% endif %} - -{% endif %} -{### Refresh publication ###} -{% if data.refresh_pub %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - REFRESH PUBLICATION{% if not data.copy_data_after_refresh %} WITH (copy_data = false){% else %} WITH (copy_data = true){% endif %}; - -{% endif %} -{### Alter publication of subscription ###} -{% if data.pub%} -{% if data.pub and not data.refresh_pub and not data.enabled %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - SET PUBLICATION {% for pub in data.pub %}{% if loop.index != 1 %},{% endif %}{{ conn|qtIdent(pub) }}{% endfor %} WITH (refresh = false); -{% else %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - SET PUBLICATION {% for pub in data.pub %}{% if loop.index != 1 %},{% endif %}{{ conn|qtIdent(pub) }}{% endfor %}; -{% endif %} - -{% endif %} -{### Alter subscription connection info ###} -{% if data.host or data.port or data.username or data.db or data.connect_timeout or data.passfile or data.sslmode or data.sslcompression or data.sslcert or data.sslkey or data.sslrootcert or data.sslcrl %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - CONNECTION 'host={{ o_data.host}} port={{ o_data.port }} user={{ o_data.username }} dbname={{ o_data.db }} connect_timeout={{ o_data.connect_timeout }} {% if data.passfile %} passfile={{ o_data.passfile }}{% endif %} sslmode={{ o_data.sslmode }}{% if data.sslcompression %} sslcompression={{ data.sslcompression }}{% endif %}{% if data.sslcert %} sslcert={{ data.sslcert }}{% endif %}{% if data.sslkey %} sslkey={{ data.sslkey }}{% endif %}{% if data.sslrootcert %} sslrootcert={{ data.sslrootcert }}{% endif %}{% if data.sslcrl %} sslcrl={{ data.sslcrl }}{% endif %}'; -{% endif %} -{### Alter subscription name ###} -{% if data.name and data.name != o_data.name %} -ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - RENAME TO {{ conn|qtIdent(data.name) }}; - -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/create.sql index 46029421a76..154d602df58 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/create.sql @@ -21,4 +21,4 @@ CREATE SUBSCRIPTION {{ conn|qtIdent(data.name) }} WITH ({% if data.connect is defined %}connect = {{ data.connect|lower}}, {% endif %}enabled = {{ data.enabled|lower}}, {% if data.copy_data is defined %}copy_data = {{ data.copy_data|lower}}{% if add_semicolon_after_copy_data == 'copy_data' %}, {% endif %}{% endif %} {% if data.create_slot is defined %}create_slot = {{ data.create_slot|lower }}{% if add_semicolon_after_create_slot == 'create_slot' %}, {% endif %}{% endif %} -{% if data.slot_name is defined and data.slot_name != ''%}slot_name = {{ data.slot_name }}{% if add_semicolon_after_slot_name == 'slot_name' %}, {% endif %}{% endif %}{% if data.sync %}synchronous_commit = '{{ data.sync }}'{% endif %}); +{% if data.slot_name is defined and data.slot_name != ''%}slot_name = {{ data.slot_name }}{% if add_semicolon_after_slot_name == 'slot_name' %}, {% endif %}{% endif %}{% if data.sync %}synchronous_commit = '{{ data.sync }}', {% endif %}binary = {{ data.binary|lower}}, streaming = '{{ data.streaming}}'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/properties.sql index a416821da18..e78722cd0a4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/properties.sql @@ -6,6 +6,8 @@ SELECT sub.oid as oid, pga.rolname as subowner, subslotname as slot_name, subenabled as enabled, + subbinary as binary, + substream as streaming, pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,' port',1), '=',2) as host, pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'port=',2), ' ',1) as port, pg_catalog.SPLIT_PART(pg_catalog.SPLIT_PART(subconninfo,'user=',2), ' ',1) as username, diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/update.sql index cbd2c43ca78..fbc647cfb36 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/update.sql @@ -1,5 +1,11 @@ {% if data.sync is defined %} -{% set add_semicolon_after_slot_name = 'slot_name' %} +{% set add_comma_after_slot_name = 'slot_name' %} +{% endif %} +{% if data.binary is defined or data.streaming is defined %} +{% set add_comma_after_sync = 'sync' %} +{% endif %} +{% if data.streaming is defined %} +{% set add_comma_after_binary = 'binary' %} {% endif %} {#####################################################} {## Change owner of subscription ##} @@ -16,10 +22,10 @@ ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} DISABLE; {% endif %} {% endif %} -{### Alter slot name of subscription ###} -{% if data.slot_name is defined or data.sync %} +{### Alter parameters of subscription ###} +{% if (data.slot_name is defined and data.slot_name != o_data.slot_name) or (data.sync is defined and data.sync != o_data.sync) or (data.binary is defined and data.binary!=o_data.binary) or (data.streaming is defined and data.streaming!=o_data.streaming) %} ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} - SET ({% if data.slot_name is defined and data.slot_name != o_data.slot_name %}slot_name = {{ data.slot_name }}{% if add_semicolon_after_slot_name == 'slot_name' %}, {% endif %}{% endif %}{% if data.sync %}synchronous_commit = '{{ data.sync }}'{% endif %}); + SET ({% if data.slot_name is defined and data.slot_name != o_data.slot_name %}slot_name = {{ data.slot_name }}{% if add_comma_after_slot_name == 'slot_name' %}, {% endif %}{% endif %}{% if data.sync is defined and data.sync != o_data.sync %}synchronous_commit = '{{ data.sync }}'{% if add_comma_after_sync == 'sync' %}, {% endif %}{% endif %}{% if data.binary is defined and data.binary!=o_data.binary %}binary = {{ data.binary|lower}}{% if add_comma_after_binary == 'binary' %}, {% endif %}{% endif %}{% if data.streaming is defined and data.streaming!=o_data.streaming %}streaming = '{{ data.streaming}}'{% endif %}); {% endif %} {### Enable subscription ###} @@ -57,9 +63,3 @@ ALTER SUBSCRIPTION {{ conn|qtIdent(o_data.name) }} RENAME TO {{ conn|qtIdent(data.name) }}; {% endif %} - - - - - - diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription.sql deleted file mode 100644 index 0adefe5f1c1..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription.sql +++ /dev/null @@ -1,8 +0,0 @@ --- Subscription: test_create_subscription - --- DROP SUBSCRIPTION IF EXISTS test_create_subscription; - -CREATE SUBSCRIPTION test_create_subscription - CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer' - PUBLICATION test_pub - WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription_msql.sql deleted file mode 100644 index 4283809e179..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/create_subscription_msql.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE SUBSCRIPTION test_create_subscription - CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 password=xxxxxx sslmode=prefer' - PUBLICATION test_pub - WITH (connect = false, enabled = false, copy_data = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/test.json deleted file mode 100644 index 8ae70293150..00000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/test.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "scenarios": [ - { - "type": "create", - "name": "Create Subscription", - "endpoint": "NODE-subscription.obj", - "sql_endpoint": "NODE-subscription.sql_id", - "msql_endpoint": "NODE-subscription.msql", - "data": { - "username": "postgres", - "name": "test_create_subscription", - "connect": false, - "connect_timeout": 10, - "copy_data": false, - "create_slot": false, - "db": "postgres", - "subowner": "", - "enabled": false, - "host": "localhost", - "slot_name": "None", - "service": "", - "port": 5434, - "password": "edb", - "sync": "remote_apply", - "binary": true, - "streaming": true, - "sslmode": "prefer", - "pub": [ - "test_pub" - ] - }, - "expected_sql_file": "create_subscription.sql", - "expected_msql_file": "create_subscription_msql.sql" - }, - { - "type": "alter", - "name": "Alter parameters of subscription", - "endpoint": "NODE-subscription.obj_id", - "sql_endpoint": "NODE-subscription.sql_id", - "msql_endpoint": "NODE-subscription.msql_id", - "data": { - "binary": false, - "streaming": false - }, - "expected_sql_file": "alter_parameters.sql", - "expected_msql_file": "alter_parameters_msql.sql" - }, - { - "type": "delete", - "name": "Drop subscription", - "endpoint": "NODE-subscription.delete_id", - "data": { - "name": "test_create_subscription" - } - } - ] -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/alter_parameters.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_parameters.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/alter_parameters.sql rename to web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_parameters.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/alter_parameters_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_parameters_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/14_plus/alter_parameters_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_parameters_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription.sql index cf2cad365b4..0adefe5f1c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription.sql @@ -3,6 +3,6 @@ -- DROP SUBSCRIPTION IF EXISTS test_create_subscription; CREATE SUBSCRIPTION test_create_subscription - CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer' - PUBLICATION sample__1 - WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'off'); + CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 sslmode=prefer' + PUBLICATION test_pub + WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription_msql.sql index 584e3856e84..4283809e179 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/create_subscription_msql.sql @@ -1,4 +1,4 @@ CREATE SUBSCRIPTION test_create_subscription - CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres connect_timeout=10 password=xxxxxx sslmode=prefer' - PUBLICATION sample__1 - WITH (connect = false, enabled = false, copy_data = false, create_slot = false, slot_name = None, synchronous_commit = 'off'); + CONNECTION 'host=localhost port=5434 user=postgres dbname=postgres connect_timeout=10 password=xxxxxx sslmode=prefer' + PUBLICATION test_pub + WITH (connect = false, enabled = false, copy_data = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/test.json b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/test.json index 7c3aa132064..8ae70293150 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/test.json @@ -10,6 +10,7 @@ "username": "postgres", "name": "test_create_subscription", "connect": false, + "connect_timeout": 10, "copy_data": false, "create_slot": false, "db": "postgres", @@ -18,13 +19,14 @@ "host": "localhost", "slot_name": "None", "service": "", - "port": 5432, + "port": 5434, "password": "edb", - "sync": "off", - "connect_timeout": 10, + "sync": "remote_apply", + "binary": true, + "streaming": true, "sslmode": "prefer", "pub": [ - "sample__1" + "test_pub" ] }, "expected_sql_file": "create_subscription.sql", @@ -32,46 +34,23 @@ }, { "type": "alter", - "name": "Alter Subscription", - "endpoint": "NODE-subscription.obj_id", - "sql_endpoint": "NODE-subscription.sql_id", - "msql_endpoint": "NODE-subscription.msql_id", - "data": { - "name": "test_alter_subscription" - }, - "expected_sql_file": "alter_subscription.sql", - "expected_msql_file": "alter_subscription_msql.sql" - }, - { - "type": "alter", - "name": "Alter sync of subscription", - "endpoint": "NODE-subscription.obj_id", - "sql_endpoint": "NODE-subscription.sql_id", - "msql_endpoint": "NODE-subscription.msql_id", - "data": { - "sync": "remote_apply" - }, - "expected_sql_file": "alter_sync.sql", - "expected_msql_file": "alter_sync_msql.sql" - }, - { - "type": "alter", - "name": "Alter maintainance DB in connection string of subscription", + "name": "Alter parameters of subscription", "endpoint": "NODE-subscription.obj_id", "sql_endpoint": "NODE-subscription.sql_id", "msql_endpoint": "NODE-subscription.msql_id", "data": { - "db": "edb" + "binary": false, + "streaming": false }, - "expected_sql_file": "alter_maintenance_db.sql", - "expected_msql_file": "alter_maintenance_db_msql.sql" + "expected_sql_file": "alter_parameters.sql", + "expected_msql_file": "alter_parameters_msql.sql" }, { "type": "delete", "name": "Drop subscription", "endpoint": "NODE-subscription.delete_id", "data": { - "name": "test_alter_subscription" + "name": "test_create_subscription" } } ] diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependencies.sql deleted file mode 100644 index f1fcbadd30a..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependencies.sql +++ /dev/null @@ -1,89 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.refobjid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', 'pg_policy')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependents.sql deleted file mode 100644 index de42814db70..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/11_plus/dependents.sql +++ /dev/null @@ -1,75 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.objid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.objid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', 'pg_policy')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependencies.sql deleted file mode 100644 index e1138db3de5..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependencies.sql +++ /dev/null @@ -1,89 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.refobjid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', 'pg_policy')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependents.sql deleted file mode 100644 index c4a3d45353c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/12_plus/dependents.sql +++ /dev/null @@ -1,75 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, pg_get_expr(ad.adbin, ad.adrelid) as adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.objid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.objid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', 'pg_policy')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependencies.sql index 3307f89e4ce..e1138db3de5 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependencies.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependencies.sql @@ -1,10 +1,10 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, +SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END WHEN tg.oid IS NOT NULL THEN 'Tr'::text WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END WHEN ns.oid IS NOT NULL THEN 'n'::text WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text + WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END WHEN la.oid IS NOT NULL THEN 'l'::text WHEN rw.oid IS NOT NULL THEN 'Rl'::text WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END @@ -73,7 +73,7 @@ refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', 'pg_policy')) UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, +SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END ELSE '' END AS type, NULL AS ownertable, diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependents.sql index 874294ff324..c4a3d45353c 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependents.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependents.sql @@ -1,10 +1,10 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, +SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, pg_get_expr(ad.adbin, ad.adrelid) as adsrc, CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END WHEN tg.oid IS NOT NULL THEN 'Tr'::text WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END WHEN ns.oid IS NOT NULL THEN 'n'::text WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text + WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END WHEN la.oid IS NOT NULL THEN 'l'::text WHEN rw.oid IS NOT NULL THEN 'Rl'::text WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependencies.sql deleted file mode 100644 index 23a06591ec4..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependencies.sql +++ /dev/null @@ -1,93 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.refobjid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym', 'pg_policy')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependents.sql deleted file mode 100644 index e53ff63898c..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/11_plus/dependents.sql +++ /dev/null @@ -1,79 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.objid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.objid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym', 'pg_policy')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependencies.sql deleted file mode 100644 index 11d88b289be..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependencies.sql +++ /dev/null @@ -1,93 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN CASE WHEN tg.tgpackageoid != 0 THEN 'Tc'::text ELSE 'Tr'::text END - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 AND ns.nspcompoundtrigger = false THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.refobjid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym', 'pg_policy')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependents.sql deleted file mode 100644 index 18984d7ad9e..00000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/12_plus/dependents.sql +++ /dev/null @@ -1,79 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, pg_get_expr(ad.adbin, ad.adrelid) as adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN CASE WHEN tg.tgpackageoid != 0 THEN 'Tc'::text ELSE 'Tr'::text END - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 AND ns.nspcompoundtrigger = false THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - WHEN pl.oid IS NOT NULL THEN 'Rs'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname, pl.polname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.objid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -LEFT JOIN pg_catalog.pg_policy pl ON pl.oid=dep.objid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym', 'pg_policy')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependencies.sql index bbf941331bc..11d88b289be 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependencies.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependencies.sql @@ -1,10 +1,10 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, +SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text + WHEN tg.oid IS NOT NULL THEN CASE WHEN tg.tgpackageoid != 0 THEN 'Tc'::text ELSE 'Tr'::text END WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END + WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 AND ns.nspcompoundtrigger = false THEN 'Pa'::text ELSE 'n'::text END WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text + WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END WHEN la.oid IS NOT NULL THEN 'l'::text WHEN rw.oid IS NOT NULL THEN 'Rl'::text WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END @@ -77,7 +77,7 @@ refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', 'pg_synonym', 'pg_policy')) UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, +SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, pg_catalog.pg_get_expr(ad.adbin, ad.adrelid) as adsrc, CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END ELSE '' END AS type, NULL AS ownertable, diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependents.sql index 7e179e9d87e..18984d7ad9e 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependents.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependents.sql @@ -1,10 +1,10 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, +SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, pg_get_expr(ad.adbin, ad.adrelid) as adsrc, CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text + WHEN tg.oid IS NOT NULL THEN CASE WHEN tg.tgpackageoid != 0 THEN 'Tc'::text ELSE 'Tr'::text END WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END + WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 AND ns.nspcompoundtrigger = false THEN 'Pa'::text ELSE 'n'::text END WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text + WHEN pr.oid IS NOT NULL THEN CASE WHEN pr.prokind = 'p' THEN 'Pp'::text ELSE 'Pf'::text END WHEN la.oid IS NOT NULL THEN 'l'::text WHEN rw.oid IS NOT NULL THEN 'Rl'::text WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END diff --git a/web/pgadmin/misc/templates/sqlautocomplete/sql/11_plus/functions.sql b/web/pgadmin/misc/templates/sqlautocomplete/sql/11_plus/functions.sql deleted file mode 100644 index 816835c55c8..00000000000 --- a/web/pgadmin/misc/templates/sqlautocomplete/sql/11_plus/functions.sql +++ /dev/null @@ -1,18 +0,0 @@ -{# ============= Fetch the list of functions based on given schema_names ============= #} -SELECT n.nspname schema_name, - p.proname func_name, - p.proargnames arg_names, - COALESCE(proallargtypes::regtype[], proargtypes::regtype[])::text[] arg_types, - p.proargmodes arg_modes, - prorettype::regtype::text return_type, - CASE WHEN p.prokind = 'a' THEN true ELSE false END is_aggregate, - CASE WHEN p.prokind = 'w' THEN true ELSE false END is_window, - p.proretset is_set_returning, - d.deptype = 'e' is_extension, - pg_catalog.pg_get_expr(proargdefaults, 0) AS arg_defaults -FROM pg_catalog.pg_proc p - INNER JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace - LEFT JOIN pg_catalog.pg_depend d ON d.objid = p.oid and d.deptype = 'e' -WHERE p.prorettype::regtype != 'trigger'::regtype - AND n.nspname IN ({{schema_names}}) -ORDER BY 1, 2 diff --git a/web/pgadmin/misc/templates/sqlautocomplete/sql/default/functions.sql b/web/pgadmin/misc/templates/sqlautocomplete/sql/default/functions.sql index 58021f9479c..816835c55c8 100644 --- a/web/pgadmin/misc/templates/sqlautocomplete/sql/default/functions.sql +++ b/web/pgadmin/misc/templates/sqlautocomplete/sql/default/functions.sql @@ -5,8 +5,8 @@ SELECT n.nspname schema_name, COALESCE(proallargtypes::regtype[], proargtypes::regtype[])::text[] arg_types, p.proargmodes arg_modes, prorettype::regtype::text return_type, - p.proisagg is_aggregate, - p.proiswindow is_window, + CASE WHEN p.prokind = 'a' THEN true ELSE false END is_aggregate, + CASE WHEN p.prokind = 'w' THEN true ELSE false END is_window, p.proretset is_set_returning, d.deptype = 'e' is_extension, pg_catalog.pg_get_expr(proargdefaults, 0) AS arg_defaults diff --git a/web/pgadmin/tools/erd/tests/sql/12_plus/test_sql_output.sql b/web/pgadmin/tools/erd/tests/sql/12_plus/test_sql_output.sql deleted file mode 100644 index d20bfcaa9ad..00000000000 --- a/web/pgadmin/tools/erd/tests/sql/12_plus/test_sql_output.sql +++ /dev/null @@ -1,25 +0,0 @@ - - -CREATE TABLE IF NOT EXISTS public.newtable1 -( - id integer, - col1 character varying(50), - PRIMARY KEY (id) -); - -CREATE TABLE IF NOT EXISTS public.newtable2 -( - table1_id integer, - col2 character varying(50), - PRIMARY KEY (id) -); - -CREATE TABLE IF NOT EXISTS public.newtable3 -( -) -; - -ALTER TABLE IF EXISTS public.newtable2 - ADD FOREIGN KEY (table1_id) - REFERENCES public.newtable1 (id) - NOT VALID; diff --git a/web/pgadmin/tools/erd/tests/sql/default/test_sql_output.sql b/web/pgadmin/tools/erd/tests/sql/default/test_sql_output.sql index 2547c83f201..d20bfcaa9ad 100644 --- a/web/pgadmin/tools/erd/tests/sql/default/test_sql_output.sql +++ b/web/pgadmin/tools/erd/tests/sql/default/test_sql_output.sql @@ -5,9 +5,6 @@ CREATE TABLE IF NOT EXISTS public.newtable1 id integer, col1 character varying(50), PRIMARY KEY (id) -) -WITH ( - OIDS = FALSE ); CREATE TABLE IF NOT EXISTS public.newtable2 @@ -15,18 +12,12 @@ CREATE TABLE IF NOT EXISTS public.newtable2 table1_id integer, col2 character varying(50), PRIMARY KEY (id) -) -WITH ( - OIDS = FALSE ); CREATE TABLE IF NOT EXISTS public.newtable3 ( ) - -WITH ( - OIDS = FALSE -); +; ALTER TABLE IF EXISTS public.newtable2 ADD FOREIGN KEY (table1_id) diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/11_plus/sql/function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/11_plus/sql/function.sql deleted file mode 100644 index d951a8bf8a4..00000000000 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/11_plus/sql/function.sql +++ /dev/null @@ -1,26 +0,0 @@ -{# ===== Fetch list of Database object types(Functions) ====== #} -{% if type and node_id %} -{% set func_type = 'Trigger Function' if type == 'trigger_function' else 'Procedure' if type == 'procedure' else 'Function' %} -{% set icon = 'icon-function' if type == 'function' else 'icon-procedure' if type == 'procedure' else 'icon-trigger_function' %} -{% set kind = 'p' if type == 'procedure' else 'f' %} -SELECT - pr.oid, - pg_catalog.pg_get_function_identity_arguments(pr.oid) AS proargs, - pr.proname AS name, - nsp.nspname AS nspname, - '{{ func_type }}' AS object_type, - '{{ icon }}' AS icon -FROM - pg_catalog.pg_proc pr -JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -JOIN pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pronamespace = {{ node_id }}::oid - AND typname {{ 'NOT' if type != 'trigger_function' else '' }} IN ('trigger', 'event_trigger') - AND pr.prokind = '{{ kind }}' -ORDER BY - proname -{% endif %} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/function.sql index b3f0d1a0efe..d951a8bf8a4 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/function.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/function.sql @@ -1,7 +1,8 @@ {# ===== Fetch list of Database object types(Functions) ====== #} {% if type and node_id %} -{% set func_type = 'Trigger Function' if type == 'trigger_function' else 'Function' %} -{% set icon = 'icon-function' if type == 'function' else 'icon-trigger_function' %} +{% set func_type = 'Trigger Function' if type == 'trigger_function' else 'Procedure' if type == 'procedure' else 'Function' %} +{% set icon = 'icon-function' if type == 'function' else 'icon-procedure' if type == 'procedure' else 'icon-trigger_function' %} +{% set kind = 'p' if type == 'procedure' else 'f' %} SELECT pr.oid, pg_catalog.pg_get_function_identity_arguments(pr.oid) AS proargs, @@ -17,8 +18,9 @@ JOIN pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace JOIN pg_catalog.pg_language lng ON lng.oid=prolang LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE AND pronamespace = {{ node_id }}::oid + pronamespace = {{ node_id }}::oid AND typname {{ 'NOT' if type != 'trigger_function' else '' }} IN ('trigger', 'event_trigger') + AND pr.prokind = '{{ kind }}' ORDER BY proname {% endif %} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/11_plus/sql/function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/11_plus/sql/function.sql deleted file mode 100644 index 57f925b8370..00000000000 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/11_plus/sql/function.sql +++ /dev/null @@ -1,27 +0,0 @@ -{# ===== Fetch list of Database object types(Functions) ====== #} -{% if type and node_id %} -{% set func_type = 'Trigger Function' if type == 'trigger_function' else 'Procedure' if type == 'procedure' else 'Function' %} -{% set icon = 'icon-function' if type == 'function' else 'icon-procedure' if type == 'procedure' else 'icon-trigger_function' %} -{% set kind = 'p' if type == 'procedure' else 'f' %} -SELECT - pr.oid, - pg_catalog.pg_get_function_identity_arguments(pr.oid) AS proargs, - pr.proname AS name, - nsp.nspname AS nspname, - '{{ func_type }}' AS object_type, - '{{ icon }}' AS icon -FROM - pg_catalog.pg_proc pr -JOIN pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace -JOIN pg_catalog.pg_type typ ON typ.oid=prorettype -JOIN pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace -JOIN pg_catalog.pg_language lng ON lng.oid=prolang -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) -WHERE - pronamespace = {{ node_id }}::oid - AND typname {{ 'NOT' if type != 'trigger_function' else '' }} IN ('trigger', 'event_trigger') - AND pr.prokind = '{{ kind }}' - AND pr.protype = {{'0' if type != 'procedure' else '1'}}::char -ORDER BY - proname -{% endif %} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/12_plus/sql/package.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/12_plus/sql/package.sql deleted file mode 100644 index 55d72cf447d..00000000000 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/12_plus/sql/package.sql +++ /dev/null @@ -1,15 +0,0 @@ -{# ===== Fetch list of Database object types(Package) ===== #} -{% if node_id %} -SELECT - nsp.nspname AS name, - snsp.nspname AS nspname, - 'Package' as object_type, - 'icon-package' as icon -FROM - pg_catalog.pg_namespace nsp -LEFT OUTER JOIN pg_catalog.pg_namespace snsp ON (nsp.nspparent = snsp.oid) -WHERE nsp.nspparent = {{ node_id }}::oid -AND nsp.nspobjecttype = 0 -AND nsp.nspcompoundtrigger = false -ORDER BY nsp.nspname; -{% endif %} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/function.sql index ac54e5b8048..57f925b8370 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/function.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/function.sql @@ -2,6 +2,7 @@ {% if type and node_id %} {% set func_type = 'Trigger Function' if type == 'trigger_function' else 'Procedure' if type == 'procedure' else 'Function' %} {% set icon = 'icon-function' if type == 'function' else 'icon-procedure' if type == 'procedure' else 'icon-trigger_function' %} +{% set kind = 'p' if type == 'procedure' else 'f' %} SELECT pr.oid, pg_catalog.pg_get_function_identity_arguments(pr.oid) AS proargs, @@ -17,8 +18,9 @@ JOIN pg_catalog.pg_namespace typns ON typns.oid=typ.typnamespace JOIN pg_catalog.pg_language lng ON lng.oid=prolang LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=pr.oid AND des.classoid='pg_proc'::regclass) WHERE - proisagg = FALSE AND pronamespace = {{ node_id }}::oid + pronamespace = {{ node_id }}::oid AND typname {{ 'NOT' if type != 'trigger_function' else '' }} IN ('trigger', 'event_trigger') + AND pr.prokind = '{{ kind }}' AND pr.protype = {{'0' if type != 'procedure' else '1'}}::char ORDER BY proname diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/package.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/package.sql index f2d7c3b4ee0..55d72cf447d 100644 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/package.sql +++ b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/package.sql @@ -10,5 +10,6 @@ FROM LEFT OUTER JOIN pg_catalog.pg_namespace snsp ON (nsp.nspparent = snsp.oid) WHERE nsp.nspparent = {{ node_id }}::oid AND nsp.nspobjecttype = 0 +AND nsp.nspcompoundtrigger = false ORDER BY nsp.nspname; {% endif %} diff --git a/web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql deleted file mode 100644 index d93bf7e8848..00000000000 --- a/web/pgadmin/tools/schema_diff/tests/pg/11_plus/source.sql +++ /dev/null @@ -1,1160 +0,0 @@ --- --- PostgreSQL database dump --- - --- Dumped from database version 10.7 --- Dumped by pg_dump version 12beta2 - --- Started on 2019-11-01 12:54:15 IST - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; -SET row_security = off; - --- --- TOC entry 17 (class 2615 OID 139770) --- Name: test_schema_diff; Type: SCHEMA; Schema: -; Owner: postgres --- - -CREATE SCHEMA test_schema_diff; - - -ALTER SCHEMA test_schema_diff OWNER TO postgres; - -SET default_tablespace = ''; - - -CREATE EXTENSION btree_gist - SCHEMA test_schema_diff; - --- --- TOC entry 12272 (class 1259 OID 149205) --- Name: table_for_partition; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_partition ( - col1 bigint NOT NULL -) -PARTITION BY RANGE (col1); - - -ALTER TABLE test_schema_diff.table_for_partition OWNER TO postgres; - --- --- TOC entry 12273 (class 1259 OID 149208) --- Name: part1; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.part1 ( - col1 bigint NOT NULL -); -ALTER TABLE ONLY test_schema_diff.table_for_partition ATTACH PARTITION test_schema_diff.part1 FOR VALUES FROM ('1') TO ('23'); - - -ALTER TABLE test_schema_diff.part1 OWNER TO postgres; - --- --- TOC entry 12274 (class 1259 OID 149213) --- Name: table_for_partition_1; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_partition_1 ( - col1 bigint -) -PARTITION BY RANGE (col1); - - -ALTER TABLE test_schema_diff.table_for_partition_1 OWNER TO postgres; - --- --- TOC entry 12275 (class 1259 OID 149216) --- Name: part3; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.part3 ( - col1 bigint -); -ALTER TABLE ONLY test_schema_diff.table_for_partition_1 ATTACH PARTITION test_schema_diff.part3 FOR VALUES FROM ('1') TO ('10'); - - -ALTER TABLE test_schema_diff.part3 OWNER TO postgres; - --- --- TOC entry 12276 (class 1259 OID 149219) --- Name: part4; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.part4 ( - col1 bigint -); -ALTER TABLE ONLY test_schema_diff.table_for_partition_1 ATTACH PARTITION test_schema_diff.part4 FOR VALUES FROM ('11') TO ('20'); - - -ALTER TABLE test_schema_diff.part4 OWNER TO postgres; - --- --- TOC entry 12258 (class 1259 OID 148963) --- Name: table_for_column; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_column ( - col1 bigint NOT NULL, - col2 text, - col3 text -); - - -ALTER TABLE test_schema_diff.table_for_column OWNER TO postgres; - --- --- TOC entry 12256 (class 1259 OID 148895) --- Name: table_for_constraints; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_constraints ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_constraints OWNER TO postgres; - --- --- TOC entry 61066 (class 0 OID 0) --- Dependencies: 12256 --- Name: TABLE table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON TABLE test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 12262 (class 1259 OID 149004) --- Name: table_for_identical; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_identical ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_identical OWNER TO postgres; - --- --- TOC entry 12260 (class 1259 OID 148977) --- Name: table_for_index; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_index ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_index OWNER TO postgres; - --- --- TOC entry 12269 (class 1259 OID 149128) --- Name: table_for_primary_key; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_primary_key ( - col1 integer NOT NULL, - col2 text NOT NULL -); - - -ALTER TABLE test_schema_diff.table_for_primary_key OWNER TO postgres; - --- --- TOC entry 12264 (class 1259 OID 149024) --- Name: table_for_rule; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_rule ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_rule OWNER TO postgres; - --- --- TOC entry 12266 (class 1259 OID 149048) --- Name: table_for_trigger; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_trigger ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_trigger OWNER TO postgres; - --- --- TOC entry 56893 (class 2606 OID 148904) --- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; - - --- --- TOC entry 61067 (class 0 OID 0) --- Dependencies: 56893 --- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT "Exclusion" ON test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 56891 (class 2606 OID 148911) --- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE test_schema_diff.table_for_constraints - ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; - - --- --- TOC entry 61068 (class 0 OID 0) --- Dependencies: 56891 --- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT check_con ON test_schema_diff.table_for_constraints IS 'coment'; - - --- --- TOC entry 56899 (class 2606 OID 148970) --- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_column - ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56895 (class 2606 OID 148902) --- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56904 (class 2606 OID 148984) --- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_index - ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56913 (class 2606 OID 149135) --- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_primary_key - ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); - - --- --- TOC entry 56909 (class 2606 OID 149031) --- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_rule - ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56907 (class 2606 OID 149011) --- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_identical - ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56911 (class 2606 OID 149055) --- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_trigger - ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56897 (class 2606 OID 148913) --- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "unique" UNIQUE (col1); - - --- --- TOC entry 61069 (class 0 OID 0) --- Dependencies: 56897 --- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT "unique" ON test_schema_diff.table_for_constraints IS 'cmnt'; - - --- --- TOC entry 56900 (class 1259 OID 149023) --- Name: index1; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index1 ON test_schema_diff.table_for_index USING btree (col2 varchar_pattern_ops); - - --- --- TOC entry 56905 (class 1259 OID 149012) --- Name: index_identical; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_identical ON test_schema_diff.table_for_identical USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56901 (class 1259 OID 149211) --- Name: index_same; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_same ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56902 (class 1259 OID 149022) --- Name: index_source; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_source ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 61044 (class 2618 OID 149032) --- Name: table_for_rule rule1; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule1 AS - ON UPDATE TO test_schema_diff.table_for_rule DO INSTEAD NOTHING; - - --- --- TOC entry 61070 (class 0 OID 0) --- Dependencies: 61044 --- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON RULE rule1 ON test_schema_diff.table_for_rule IS 'comments'; - - --- --- TOC entry 61045 (class 2618 OID 149033) --- Name: table_for_rule rule2; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule2 AS - ON INSERT TO test_schema_diff.table_for_rule DO NOTHING; - --- --- TOC entry 12283 (class 1259 OID 347818) --- Name: test view; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view" AS - SELECT pg_class.relname, - pg_class.relnamespace, - pg_class.reltype, - pg_class.reloftype, - pg_class.relowner, - pg_class.relam, - pg_class.relfilenode, - pg_class.reltablespace, - pg_class.relpages, - pg_class.reltuples, - pg_class.relallvisible, - pg_class.reltoastrelid, - pg_class.relhasindex, - pg_class.relisshared, - pg_class.relpersistence, - pg_class.relkind, - pg_class.relnatts, - pg_class.relchecks, - pg_class.relhasoids, - pg_class.relhasrules, - pg_class.relhastriggers, - pg_class.relhassubclass, - pg_class.relrowsecurity, - pg_class.relforcerowsecurity, - pg_class.relispopulated, - pg_class.relreplident, - pg_class.relispartition, - pg_class.relfrozenxid, - pg_class.relminmxid, - pg_class.relacl, - pg_class.reloptions, - pg_class.relpartbound - FROM pg_catalog.pg_class - LIMIT 10; - - -ALTER TABLE test_schema_diff."test view" OWNER TO postgres; - --- --- TOC entry 12286 (class 1259 OID 347832) --- Name: test view f; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view f" WITH (security_barrier='false') AS - SELECT 2; - - -ALTER TABLE test_schema_diff."test view f" OWNER TO postgres; - --- --- TOC entry 61111 (class 0 OID 0) --- Dependencies: 12286 --- Name: VIEW "test view f"; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON VIEW test_schema_diff."test view f" IS 'cmn'; - --- Collation scripts -CREATE COLLATION test_schema_diff.coll_src - FROM pg_catalog."POSIX"; - -ALTER COLLATION test_schema_diff.coll_src - OWNER TO postgres; - -COMMENT ON COLLATION test_schema_diff.coll_src - IS 'Test Comment'; - -CREATE COLLATION test_schema_diff.coll_diff - (LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX'); - -ALTER COLLATION test_schema_diff.coll_diff - OWNER TO postgres; - -COMMENT ON COLLATION test_schema_diff.coll_diff - IS 'Test Comment'; - --- FTS Configuration scripts -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src ( - COPY=german -); - -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src OWNER TO postgres; - -COMMENT ON TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src - IS 'Test Comment'; - -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ( - PARSER = default -); -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR email WITH simple; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem; - --- FTS Dictionary scripts -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_src ( - TEMPLATE = simple, - stopwords = 'english' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_src - IS 'Test Comment'; - -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff ( - TEMPLATE = simple, - stopwords = 'english' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff - IS 'Test Comment'; - --- FTS Parser scripts -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_src ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_src - IS 'Test Comment'; - -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_diff ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_diff - IS 'Test Comment'; - --- FTS Template scripts -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_src ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_src IS 'Test Comment'; - -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff IS 'Test Comment'; - --- Domain and Domain Constraint script -CREATE DOMAIN test_schema_diff.dom_src - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_src OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_src - ADD CONSTRAINT con_src CHECK (VALUE <> 100); - -CREATE DOMAIN test_schema_diff.dom_cons_diff - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_cons_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50); - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25); - -CREATE DOMAIN test_schema_diff.dom_type_diff - AS character varying(40) - COLLATE pg_catalog."POSIX"; - -ALTER DOMAIN test_schema_diff.dom_type_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text); - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text); - -COMMENT ON DOMAIN test_schema_diff.dom_type_diff - IS 'Test comment'; - --- Type Script composite type -CREATE TYPE test_schema_diff.typ_comp_src AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_diff AS -( - m1 numeric(5,2), - m3 character varying(30) COLLATE pg_catalog."C" -); -ALTER TYPE test_schema_diff.typ_comp_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_comp_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO PUBLIC; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO pg_monitor WITH GRANT OPTION; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_diff_no_column AS -( -); -ALTER TYPE test_schema_diff.typ_comp_diff_no_column - OWNER TO postgres; - --- Type Script ENUM type -CREATE TYPE test_schema_diff.typ_enum_src AS ENUM - ('test_enum'); -ALTER TYPE test_schema_diff.typ_enum_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_enum_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_enum_src TO pg_monitor WITH GRANT OPTION; - --- Type Script RANGE type -CREATE TYPE test_schema_diff.typ_range_src AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_col_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_col_diff - OWNER TO pg_monitor; -COMMENT ON TYPE test_schema_diff.typ_range_col_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_range_col_diff TO PUBLIC; -GRANT USAGE ON TYPE test_schema_diff.typ_range_col_diff TO pg_monitor WITH GRANT OPTION; - -CREATE TYPE test_schema_diff.typ_range_subtype_diff AS RANGE -( - SUBTYPE=bpchar, - COLLATION = pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_range_subtype_diff - OWNER TO postgres; - --- Type Script SHELL type -CREATE TYPE test_schema_diff.typ_shell_src; -ALTER TYPE test_schema_diff.typ_shell_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_shell_diff; -ALTER TYPE test_schema_diff.typ_shell_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_shell_diff - IS 'Test Comment'; - --- Type script to test when Type is different -CREATE TYPE test_schema_diff.typ_comp_range_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_enum_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_comp_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_enum_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_enum_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_comp_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_range_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_range_diff - OWNER TO postgres; - --- Sequences Script -CREATE SEQUENCE test_schema_diff.seq_src - CYCLE - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 3 - CACHE 6; -ALTER SEQUENCE test_schema_diff.seq_src - OWNER TO postgres; -COMMENT ON SEQUENCE test_schema_diff.seq_src - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_src TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_src TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl - OWNER TO postgres; -COMMENT ON SEQUENCE test_schema_diff.seq_diff_comment_acl - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff - CYCLE - INCREMENT 3 - START 3 - MINVALUE 3 - MAXVALUE 100 - CACHE 2; -ALTER SEQUENCE test_schema_diff.seq_diff - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_start_diff - INCREMENT 5 - START 3 - MINVALUE 3 - MAXVALUE 20; -ALTER SEQUENCE test_schema_diff.seq_start_diff - OWNER TO postgres; - --- Foreign Data Wrapper to test foreign table -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table - OWNER TO postgres; - --- Foreign Server to test foreign table -CREATE SERVER test_fs_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs_for_foreign_table - OWNER TO postgres; -CREATE SERVER test_fs2_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs2_for_foreign_table - OWNER TO postgres; - --- Table to test inheritance in foreign table -CREATE TABLE public.test_table_for_foreign_table -( - tid bigint NOT NULL, - tname text COLLATE pg_catalog."default", - CONSTRAINT test_table_for_foreign_table_pkey PRIMARY KEY (tid) -) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; -ALTER TABLE public.test_table_for_foreign_table - OWNER to postgres; - --- Foreign Table scripts -CREATE FOREIGN TABLE test_schema_diff.ft_src( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_src - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_src - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_src - IS 'Test Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_src TO pg_monitor; -GRANT ALL ON TABLE test_schema_diff.ft_src TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_col( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default", - fcity character varying(40) NULL COLLATE pg_catalog."POSIX" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_diff_col - IS 'Test Comment'; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_const( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - OWNER TO postgres; - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck1 CHECK ((fid > 1000)) NO INHERIT NOT VALID; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck2 CHECK ((fid > 20)); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck_src CHECK ((fid > 50)); - -GRANT INSERT ON TABLE test_schema_diff.ft_diff_const TO pg_monitor; -GRANT ALL ON TABLE test_schema_diff.ft_diff_const TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_opt( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (opt1 'val1', opt2 'val20', opt_src 'val_src'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_opt - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (opt1 'val1'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT; - --- Test for RM #5350 -CREATE TABLE test_schema_diff.events_transactions -( - event_code integer, - numerator integer, - account_token text COLLATE pg_catalog."default", - transaction_dt timestamp without time zone, - payment_method integer, - payment_pin integer, - approval text COLLATE pg_catalog."default", - amount integer, - file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP, - file_name character varying(256) COLLATE pg_catalog."default", - transfer_dt timestamp without time zone, - transaction_type integer -); - --- Casts script -CREATE CAST (money AS bigint) - WITHOUT FUNCTION - AS IMPLICIT; - -COMMENT ON CAST (money AS bigint) IS 'money -> bigint'; - --- Event Trigger script -CREATE FUNCTION public.evt_tri_fun() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun() - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_src ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -COMMENT ON EVENT TRIGGER evt_tri_src - IS 'Event Trigger Source'; -ALTER EVENT TRIGGER evt_tri_src - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event1 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event2 ON DDL_COMMAND_END - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event3 ON SQL_DROP - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status1 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - DISABLE; -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status2 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - ENABLE REPLICA; -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status3 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - ENABLE ALWAYS; -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_func ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_func - OWNER TO postgres; - --- Extension script -CREATE EXTENSION adminpack - SCHEMA pg_catalog - VERSION "1.1"; - --- Language script -CREATE TRUSTED PROCEDURAL LANGUAGE src_trusted_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE src_trusted_language - OWNER TO postgres; -COMMENT ON LANGUAGE src_trusted_language - IS 'Custom Trusted Language'; -GRANT USAGE ON LANGUAGE src_trusted_language TO PUBLIC; -GRANT USAGE ON LANGUAGE src_trusted_language TO postgres WITH GRANT OPTION; - -CREATE PROCEDURAL LANGUAGE src_proc_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE src_proc_language - OWNER TO postgres; -COMMENT ON LANGUAGE src_proc_language - IS 'Custom Procedural Language'; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_add - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_add - OWNER TO postgres; -GRANT USAGE ON LANGUAGE lan_diff_acl_add TO PUBLIC; -GRANT USAGE ON LANGUAGE lan_diff_acl_add TO postgres WITH GRANT OPTION; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_revoke - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_revoke - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_type - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_inline_validator - HANDLER plpgsql_call_handler - INLINE prsd_end - VALIDATOR pg_stat_reset_single_table_counters; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - --- Foreign Data Wrapper Script -CREATE FOREIGN DATA WRAPPER fdw_src - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_src - OWNER TO postgres; -COMMENT ON FOREIGN DATA WRAPPER fdw_src - IS 'Foreign Data Wrapper'; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_add - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_add - OWNER TO postgres; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_add TO PUBLIC; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_add TO postgres WITH GRANT OPTION; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_revoke - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_revoke - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_validator - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_add_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_options; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_options - OPTIONS (debug 'false'); -ALTER FOREIGN DATA WRAPPER fdw_diff_options - OWNER TO postgres; - --- Foreign Server Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_server - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OWNER TO postgres; - -CREATE SERVER fs_src - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_src - OWNER TO postgres; -COMMENT ON SERVER fs_src - IS 'Foreign Server'; - -CREATE SERVER fs_diff_acl_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_add - OWNER TO postgres; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_add TO PUBLIC; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_add TO postgres WITH GRANT OPTION; - -CREATE SERVER fs_diff_acl_revoke - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_revoke - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_add - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_add - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_modify - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_modify - OWNER TO postgres; - -CREATE SERVER fs_diff_options_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_add - OWNER TO postgres; - -CREATE SERVER fs_diff_options_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_options_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_options_modify - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '192.168.1.1', port '8080'); -ALTER SERVER fs_diff_options_modify - OWNER TO postgres; - --- User Mapping Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_user_mapping - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_user_mapping - OWNER TO postgres; - -CREATE SERVER test_fs_for_user_mapping - FOREIGN DATA WRAPPER test_fdw_for_user_mapping; -ALTER SERVER test_fs_for_user_mapping - OWNER TO postgres; - -CREATE USER MAPPING FOR public SERVER test_fs_for_user_mapping; - -CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping - OPTIONS (password 'admin123'); - --- Publication scripts - -CREATE TABLE test_schema_diff.table_for_publication ( - col1 integer NOT NULL, - col2 text -); - -CREATE PUBLICATION for_all_table - FOR ALL TABLES - WITH (publish = 'insert, delete'); - -CREATE PUBLICATION with_one_table - FOR TABLE test_schema_diff.table_for_publication - WITH (publish = 'insert, delete'); - -ALTER PUBLICATION with_one_table - RENAME TO with_one_table_alter; - -ALTER PUBLICATION with_one_table_alter SET - (publish = 'insert, update, truncate'); - --- Subscription script - -CREATE SUBSCRIPTION "subscription_test1" - CONNECTION 'host=localhost port=5432 user=postgres dbname=edb password=samplepassword' - PUBLICATION sample_publication - WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'off'); - -ALTER SUBSCRIPTION subscription_test1 - CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres'; - -ALTER SUBSCRIPTION subscription_test1 - SET (synchronous_commit = 'remote_apply'); - -ALTER SUBSCRIPTION subscription_test1 - SET PUBLICATION edb WITH (refresh = false); - -ALTER SUBSCRIPTION subscription_test1 - RENAME TO subscription_test; - -DROP SUBSCRIPTION subscription_test; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql deleted file mode 100644 index 26634daf928..00000000000 --- a/web/pgadmin/tools/schema_diff/tests/pg/11_plus/target.sql +++ /dev/null @@ -1,1109 +0,0 @@ --- --- PostgreSQL database dump --- - --- Dumped from database version 10.7 --- Dumped by pg_dump version 12beta2 - --- Started on 2019-11-01 12:55:22 IST - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; -SET row_security = off; - --- --- TOC entry 18 (class 2615 OID 139771) --- Name: test_schema_diff; Type: SCHEMA; Schema: -; Owner: postgres --- - -CREATE SCHEMA test_schema_diff; - -ALTER SCHEMA test_schema_diff OWNER TO postgres; - -SET default_tablespace = ''; - -CREATE EXTENSION btree_gist - SCHEMA test_schema_diff; - --- --- TOC entry 12250 (class 1259 OID 139938) --- Name: MView; Type: MATERIALIZED VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE MATERIALIZED VIEW test_schema_diff."MView" AS - SELECT 'tekst'::text AS text - WITH NO DATA; - - -ALTER TABLE test_schema_diff."MView" OWNER TO postgres; - --- --- TOC entry 12277 (class 1259 OID 149234) --- Name: table_for_partition_1; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_partition_1 ( - col1 bigint -) -PARTITION BY RANGE (col1); - - -ALTER TABLE test_schema_diff.table_for_partition_1 OWNER TO postgres; - --- --- TOC entry 12278 (class 1259 OID 149237) --- Name: part3; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.part3 ( - col1 bigint -); -ALTER TABLE ONLY test_schema_diff.table_for_partition_1 ATTACH PARTITION test_schema_diff.part3 FOR VALUES FROM ('13') TO ('56'); - - -ALTER TABLE test_schema_diff.part3 OWNER TO postgres; - --- --- TOC entry 12259 (class 1259 OID 148971) --- Name: table_for_column; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_column ( - col1 bigint, - col2 bigint, - col4 text -); - - -ALTER TABLE test_schema_diff.table_for_column OWNER TO postgres; - --- --- TOC entry 12268 (class 1259 OID 149089) --- Name: table_for_constraints; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_constraints ( - col1 integer NOT NULL, - col2 text, - CONSTRAINT check_con CHECK ((col1 > 30)) -); - - -ALTER TABLE test_schema_diff.table_for_constraints OWNER TO postgres; - --- --- TOC entry 61066 (class 0 OID 0) --- Dependencies: 12268 --- Name: TABLE table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON TABLE test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 61067 (class 0 OID 0) --- Dependencies: 12268 --- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT check_con ON test_schema_diff.table_for_constraints IS 'coment'; - - --- --- TOC entry 12257 (class 1259 OID 148960) --- Name: table_for_del; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_del ( -); - - -ALTER TABLE test_schema_diff.table_for_del OWNER TO postgres; - --- --- TOC entry 12271 (class 1259 OID 149172) --- Name: table_for_foreign_key; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_foreign_key ( - col1 integer NOT NULL, - col2 "char", - col3 bigint -); - - -ALTER TABLE test_schema_diff.table_for_foreign_key OWNER TO postgres; - --- --- TOC entry 12263 (class 1259 OID 149013) --- Name: table_for_identical; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_identical ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_identical OWNER TO postgres; - --- --- TOC entry 12261 (class 1259 OID 148986) --- Name: table_for_index; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_index ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_index OWNER TO postgres; - --- --- TOC entry 12270 (class 1259 OID 149144) --- Name: table_for_primary_key; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_primary_key ( - col1 integer NOT NULL, - col2 text NOT NULL -); - - -ALTER TABLE test_schema_diff.table_for_primary_key OWNER TO postgres; - --- --- TOC entry 12265 (class 1259 OID 149034) --- Name: table_for_rule; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_rule ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_rule OWNER TO postgres; - --- --- TOC entry 12267 (class 1259 OID 149066) --- Name: table_for_trigger; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_trigger ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_trigger OWNER TO postgres; - - --- --- TOC entry 56906 (class 2606 OID 149097) --- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; - - --- --- TOC entry 61068 (class 0 OID 0) --- Dependencies: 56906 --- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT "Exclusion" ON test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 56910 (class 2606 OID 149176) --- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_foreign_key - ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56897 (class 2606 OID 148993) --- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_index - ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56908 (class 2606 OID 149151) --- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_primary_key - ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56902 (class 2606 OID 149041) --- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_rule - ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56900 (class 2606 OID 149020) --- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_identical - ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56904 (class 2606 OID 149073) --- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_trigger - ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56893 (class 1259 OID 148994) --- Name: index1; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index1 ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56894 (class 1259 OID 148995) --- Name: index2; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index2 ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56898 (class 1259 OID 149021) --- Name: index_identical; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_identical ON test_schema_diff.table_for_identical USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56895 (class 1259 OID 149212) --- Name: index_same; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_same ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56892 (class 1259 OID 139945) --- Name: mview_index; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX mview_index ON test_schema_diff."MView" USING btree (text text_pattern_ops); - - --- --- TOC entry 61045 (class 2618 OID 149042) --- Name: table_for_rule rule1; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule1 AS - ON UPDATE TO test_schema_diff.table_for_rule DO INSTEAD NOTHING; - - --- --- TOC entry 61069 (class 0 OID 0) --- Dependencies: 61045 --- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON RULE rule1 ON test_schema_diff.table_for_rule IS 'comments'; - - --- --- TOC entry 61046 (class 2618 OID 149043) --- Name: table_for_rule rule2; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule2 AS - ON UPDATE TO test_schema_diff.table_for_rule DO NOTHING; - - --- --- TOC entry 61047 (class 2618 OID 149044) --- Name: table_for_rule rule3; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule3 AS - ON INSERT TO test_schema_diff.table_for_rule DO NOTHING; - - --- --- TOC entry 61050 (class 0 OID 139938) --- Dependencies: 12250 61062 --- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: test_schema_diff; Owner: postgres --- - -REFRESH MATERIALIZED VIEW test_schema_diff."MView"; - --- --- TOC entry 12284 (class 1259 OID 347823) --- Name: test view; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view" AS - SELECT pg_class.relname, - pg_class.relnamespace, - pg_class.reltype, - pg_class.reloftype, - pg_class.relowner, - pg_class.relam, - pg_class.relfilenode, - pg_class.reltablespace, - pg_class.relpages, - pg_class.reltuples, - pg_class.relallvisible, - pg_class.reltoastrelid, - pg_class.relhasindex, - pg_class.relisshared, - pg_class.relpersistence, - pg_class.relkind, - pg_class.relnatts, - pg_class.relchecks, - pg_class.relhasoids, - pg_class.relhasrules, - pg_class.relhastriggers, - pg_class.relhassubclass, - pg_class.relrowsecurity, - pg_class.relforcerowsecurity, - pg_class.relispopulated, - pg_class.relreplident, - pg_class.relispartition, - pg_class.relfrozenxid, - pg_class.relminmxid, - pg_class.relacl, - pg_class.reloptions, - pg_class.relpartbound - FROM pg_catalog.pg_class - LIMIT 10; - - -ALTER TABLE test_schema_diff."test view" OWNER TO postgres; - --- --- TOC entry 12285 (class 1259 OID 347828) --- Name: test view f; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view f" WITH (security_barrier='true') AS - SELECT 2; - - -ALTER TABLE test_schema_diff."test view f" OWNER TO postgres; - --- --- TOC entry 61105 (class 0 OID 0) --- Dependencies: 12285 --- Name: VIEW "test view f"; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON VIEW test_schema_diff."test view f" IS 'cmn'; - --- Collation scripts -CREATE COLLATION test_schema_diff.coll_tar - FROM pg_catalog."POSIX"; - -ALTER COLLATION test_schema_diff.coll_tar - OWNER TO postgres; - -CREATE COLLATION test_schema_diff.coll_diff - (LC_COLLATE = 'C', LC_CTYPE = 'C'); - -ALTER COLLATION test_schema_diff.coll_diff - OWNER TO postgres; - --- FTS Configuration scripts -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_tar ( - COPY=german -); - -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_tar OWNER TO postgres; - -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ( - PARSER = default -); -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR email WITH simple; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR hword WITH german_stem; - --- FTS Dictionary scripts -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_tar ( - TEMPLATE = simple, - stopwords = 'english' -); - -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff ( - TEMPLATE = simple, - stopwords = 'german' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff - IS 'Comment'; - --- FTS Parser scripts -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_tar ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_diff ( - START = int4_accum, - GETTOKEN = inet_gist_penalty, - END = btint2sortsupport, - LEXTYPES = dispell_init); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_diff - IS 'Comment'; - --- FTS Template scripts -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_tar ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff ( - INIT = dsimple_init, - LEXIZE = dsimple_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff IS 'Comment'; - --- Domain and Domain Constraint script -CREATE DOMAIN test_schema_diff.dom_tar - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_tar OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_tar - ADD CONSTRAINT con_tar CHECK (VALUE <> 100); - -CREATE DOMAIN test_schema_diff.dom_cons_diff - AS bigint - DEFAULT 400; - -ALTER DOMAIN test_schema_diff.dom_cons_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40); - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25); - -CREATE DOMAIN test_schema_diff.dom_type_diff - AS numeric(8,4); - -ALTER DOMAIN test_schema_diff.dom_type_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric); - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric); - -COMMENT ON DOMAIN test_schema_diff.dom_type_diff - IS 'Comment'; - --- Type Script composite type -CREATE TYPE test_schema_diff.typ_comp_tar AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_tar - OWNER TO postgres; -CREATE TYPE test_schema_diff.typ_comp_diff AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_diff_no_column AS -( - a "char", - b "char" -); -ALTER TYPE test_schema_diff.typ_comp_diff_no_column - OWNER TO postgres; - --- Type Script ENUM type -CREATE TYPE test_schema_diff.typ_enum_tar AS ENUM - ('test_enum'); -ALTER TYPE test_schema_diff.typ_enum_tar - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_diff - OWNER TO postgres; - --- Type Script RANGE type -CREATE TYPE test_schema_diff.typ_range_tar AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_tar - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_col_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_col_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_subtype_diff AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops -); -ALTER TYPE test_schema_diff.typ_range_subtype_diff - OWNER TO postgres; - --- Type Script SHELL type -CREATE TYPE test_schema_diff.typ_shell_tar; -ALTER TYPE test_schema_diff.typ_shell_tar - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_shell_diff; -ALTER TYPE test_schema_diff.typ_shell_diff - OWNER TO pg_monitor; - --- Type script to test when Type is different -CREATE TYPE test_schema_diff.typ_comp_range_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_comp_enum_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_comp_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_range_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_range_enum_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_comp_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_enum_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_range_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_enum_range_diff - OWNER TO postgres; - --- Sequences Script -CREATE SEQUENCE test_schema_diff.seq_tar - CYCLE - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 3 - CACHE 6; -ALTER SEQUENCE test_schema_diff.seq_tar - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; - -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - OWNER TO postgres; -COMMENT ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff - INCREMENT 5 - START 3 - MINVALUE 3 - MAXVALUE 80 - CACHE 1; - -ALTER SEQUENCE test_schema_diff.seq_diff - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_start_diff - INCREMENT 5 - START 1 - MINVALUE 1 - MAXVALUE 20; -ALTER SEQUENCE test_schema_diff.seq_start_diff - OWNER TO postgres; - --- Foreign Data Wrapper to test foreign table -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table - OWNER TO postgres; - --- Foreign Server to test foreign table -CREATE SERVER test_fs_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs_for_foreign_table - OWNER TO postgres; -CREATE SERVER test_fs2_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs2_for_foreign_table - OWNER TO postgres; - --- Table to test inheritance in foreign table -CREATE TABLE public.test_table_for_foreign_table -( - tid bigint NOT NULL, - tname text COLLATE pg_catalog."default", - CONSTRAINT test_table_for_foreign_table_pkey PRIMARY KEY (tid) -) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; -ALTER TABLE public.test_table_for_foreign_table - OWNER to postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_tar( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_tar - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_tar - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_tar - IS 'Test Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_tar TO pg_monitor; -GRANT ALL ON TABLE test_schema_diff.ft_tar TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_col( - fid bigint NULL, - fname text NOT NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_diff_col - IS 'Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_diff_col TO pg_monitor; -GRANT ALL ON TABLE test_schema_diff.ft_diff_col TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_const( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - OWNER TO postgres; - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck1 CHECK ((fid > 50)) NO INHERIT NOT VALID; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck2 CHECK ((fid > 20)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck_tar CHECK ((fid > 50)); - -GRANT INSERT ON TABLE test_schema_diff.ft_diff_const TO pg_monitor; -GRANT ALL ON TABLE test_schema_diff.ft_diff_const TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_opt( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (debug 'true', opt2 'val30', opt_tar 'val_tar'); - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_opt - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs2_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1( - fid bigint NULL, - fcity text NULL COLLATE pg_catalog."default" -) - SERVER test_fs2_for_foreign_table - OPTIONS (opt1 'val1', opt2 'val2'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT; - --- Test for RM #5350 -CREATE TABLE test_schema_diff.events_transactions -( - event_code integer, - numerator integer, - account_token text COLLATE pg_catalog."default", - transaction_dt timestamp without time zone, - payment_method integer, - approval text COLLATE pg_catalog."default", - amount integer, - file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP, - file_name character varying(256) COLLATE pg_catalog."default", - payment_pin integer, - transfer_dt timestamp without time zone, - transaction_type integer -); - --- Event Trigger script -CREATE FUNCTION public.evt_tri_fun() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun() - OWNER TO postgres; - -CREATE FUNCTION public.evt_tri_fun2() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun2() - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_tar ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -COMMENT ON EVENT TRIGGER evt_tri_tar - IS 'Event Trigger Source'; -ALTER EVENT TRIGGER evt_tri_tar - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event1 ON DDL_COMMAND_END - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event2 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event3 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status1 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status2 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - DISABLE; -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status3 ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_func ON DDL_COMMAND_START - EXECUTE FUNCTION public.evt_tri_fun2(); -ALTER EVENT TRIGGER evt_tri_diff_func - OWNER TO postgres; - --- Extension script -CREATE EXTENSION adminpack - SCHEMA pg_catalog - VERSION "1.0"; - --- Language script -CREATE TRUSTED PROCEDURAL LANGUAGE tar_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE tar_language - OWNER TO postgres; -GRANT USAGE ON LANGUAGE tar_language TO PUBLIC; -GRANT USAGE ON LANGUAGE tar_language TO postgres WITH GRANT OPTION; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_add - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_add - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_revoke - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_revoke - OWNER TO postgres; -GRANT USAGE ON LANGUAGE lan_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON LANGUAGE lan_diff_acl_revoke TO postgres WITH GRANT OPTION; - -CREATE PROCEDURAL LANGUAGE lan_diff_type - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_inline_validator - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - --- Foreign Data Wrapper Script -CREATE FOREIGN DATA WRAPPER fdw_tar - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_tar - OWNER TO postgres; -COMMENT ON FOREIGN DATA WRAPPER fdw_tar - IS 'Foreign Data Wrapper'; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_add - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_add - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_revoke - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_revoke - OWNER TO postgres; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_revoke TO postgres WITH GRANT OPTION; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_validator - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_options; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_options - OWNER TO postgres; - --- Foreign Server Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_server - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OWNER TO postgres; - -CREATE SERVER fs_tar - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_tar - OWNER TO postgres; -COMMENT ON SERVER fs_tar - IS 'Foreign Server'; - -CREATE SERVER fs_diff_acl_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_add - OWNER TO postgres; - -CREATE SERVER fs_diff_acl_revoke - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_revoke - OWNER TO postgres; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_revoke TO postgres WITH GRANT OPTION; - -CREATE SERVER fs_diff_type_version_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_add - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_remove - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_modify - TYPE 'EPAS' - VERSION '11' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_modify - OWNER TO postgres; - -CREATE SERVER fs_diff_options_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_options_add - OWNER TO postgres; - -CREATE SERVER fs_diff_options_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_options_modify - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_modify - OWNER TO postgres; - --- User Mapping Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_user_mapping - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_user_mapping - OWNER TO postgres; - -CREATE SERVER test_fs_for_user_mapping - FOREIGN DATA WRAPPER test_fdw_for_user_mapping; -ALTER SERVER test_fs_for_user_mapping - OWNER TO postgres; - -CREATE USER MAPPING FOR public SERVER test_fs_for_user_mapping - OPTIONS (password 'admin123'); - -CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping; - --- Publication scripts - -CREATE TABLE test_schema_diff.table_for_publication ( - col1 integer NOT NULL, - col2 text -); - -CREATE TABLE test_schema_diff.table_for_publication_in_target ( - col1 integer NOT NULL, - col2 text -); - -CREATE PUBLICATION for_all_table - FOR ALL TABLES - WITH (publish = 'insert, delete'); - -CREATE PUBLICATION with_one_table_in_target - FOR TABLE test_schema_diff.table_for_publication_in_target - WITH (publish = 'insert, delete'); - -ALTER PUBLICATION with_one_table_in_target - RENAME TO with_one_table_in_target_alter; - -ALTER PUBLICATION with_one_table_in_target_alter SET - (publish = 'insert, update, truncate'); - --- Subscription script - -CREATE SUBSCRIPTION "subscription_test1_in_target" - CONNECTION 'host=localhost port=5432 user=postgres dbname=edb password=samplepassword' - PUBLICATION sample_publication - WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'off'); - -ALTER SUBSCRIPTION subscription_test1_in_target - CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres'; - -ALTER SUBSCRIPTION subscription_test1_in_target - SET (synchronous_commit = 'remote_apply'); - -ALTER SUBSCRIPTION subscription_test1_in_target - SET PUBLICATION edb WITH (refresh = false); - -ALTER SUBSCRIPTION subscription_test1_in_target - RENAME TO subscription_test_in_target; - -DROP SUBSCRIPTION subscription_test_in_target; diff --git a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/default/source.sql similarity index 100% rename from web/pgadmin/tools/schema_diff/tests/pg/12_plus/source.sql rename to web/pgadmin/tools/schema_diff/tests/pg/default/source.sql diff --git a/web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/pg/default/target.sql similarity index 100% rename from web/pgadmin/tools/schema_diff/tests/pg/12_plus/target.sql rename to web/pgadmin/tools/schema_diff/tests/pg/default/target.sql diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/11_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/ppas/default/source.sql similarity index 100% rename from web/pgadmin/tools/schema_diff/tests/ppas/11_plus/source.sql rename to web/pgadmin/tools/schema_diff/tests/ppas/default/source.sql diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/11_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/ppas/default/target.sql similarity index 100% rename from web/pgadmin/tools/schema_diff/tests/ppas/11_plus/target.sql rename to web/pgadmin/tools/schema_diff/tests/ppas/default/target.sql diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql deleted file mode 100644 index 0b91766b763..00000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/11_plus/search.sql +++ /dev/null @@ -1,560 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('S','v','m') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['table', 'partition'] %} - SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( - WITH RECURSIVE table_path_data as ( - select c.oid as oid, 0 as height, c.relkind, - CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path - from table_path_data order by height desc limit 1 - ) obj_path, n.nspname AS schema_name, - CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} - ELSE {{ show_node_prefs['table'] }} END AS show_node, - NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE c.relkind in ('p','r','t') - {% if obj_type == 'table' %} - AND NOT c.relispartition - {% elif obj_type == 'partition' %} - AND c.relispartition - {% endif %} - AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || - case - when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname - WHEN tab.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select tab.oid as oid, 0 as height, tab.relkind, - CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid='pg_catalog.pg_constraint'::regclass AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function', 'procedure'] %} - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - WHEN p.prokind = 'p' THEN 'procedure' - ELSE 'function' - END::text AS obj_type, p.proname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN ':trigger_function.' - WHEN p.prokind = 'p' THEN ':procedure.' - ELSE ':function.' - END || p.oid ||':/' || p.proname AS obj_path, n.nspname AS schema_name, - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN {{ show_node_prefs['trigger_function'] }} - WHEN p.prokind = 'p' THEN {{ show_node_prefs['procedure'] }} - ELSE {{ show_node_prefs['function'] }} - END AS show_node, - pg_catalog.pg_get_function_identity_arguments(p.oid) AS other_info - from pg_catalog.pg_proc p join pg_catalog.pg_namespace n - on p.pronamespace = n.oid join pg_catalog.pg_type t - on p.prorettype = t.oid join pg_catalog.pg_language lng - ON lng.oid=p.prolang - WHERE p.prokind IN ('f', 'w', 'p') - AND CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN lng.lanname NOT IN ('edbspl', 'sql', 'internal') - ELSE true - END - AND ({{ CATALOGS.DB_SUPPORT('n') }}) AND p.prokind != 'a' -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 - and not t.relispartition -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/'|| - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) || - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if all_obj or obj_type in ['publication'] %} - SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_publication pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if 'subscription' not in skip_obj_type%} -{% if all_obj or obj_type in ['subscription'] %} - SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_subscription pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% endif %} -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints' AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_catalog.pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator' AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql index 9fc64a69482..0b91766b763 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql @@ -119,18 +119,35 @@ FROM ( {% if all_obj %} UNION {% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function'] %} +{% if all_obj or obj_type in ['trigger_function', 'function', 'procedure'] %} SELECT CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - ELSE 'function' END::text AS obj_type, p.proname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || case when t.typname = 'trigger' then ':trigger_function.' else ':function.' end || p.oid ||':/' || p.proname AS obj_path, n.nspname AS schema_name, - CASE WHEN t.typname IN ('trigger', 'event_trigger') THEN {{ show_node_prefs['trigger_function'] }} ELSE {{ show_node_prefs['function'] }} END AS show_node, - pg_catalog.pg_get_function_identity_arguments(p.oid) AS other_info - from pg_catalog.pg_proc p - left join pg_catalog.pg_namespace n on p.pronamespace = n.oid - left join pg_catalog.pg_type t on p.prorettype = t.oid - WHERE ({{ CATALOGS.DB_SUPPORT('n') }}) AND NOT p.proisagg + WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' + WHEN p.prokind = 'p' THEN 'procedure' + ELSE 'function' + END::text AS obj_type, p.proname AS obj_name, + ':schema.'|| n.oid || ':/' || n.nspname || '/' || + CASE + WHEN t.typname IN ('trigger', 'event_trigger') THEN ':trigger_function.' + WHEN p.prokind = 'p' THEN ':procedure.' + ELSE ':function.' + END || p.oid ||':/' || p.proname AS obj_path, n.nspname AS schema_name, + CASE + WHEN t.typname IN ('trigger', 'event_trigger') THEN {{ show_node_prefs['trigger_function'] }} + WHEN p.prokind = 'p' THEN {{ show_node_prefs['procedure'] }} + ELSE {{ show_node_prefs['function'] }} + END AS show_node, + pg_catalog.pg_get_function_identity_arguments(p.oid) AS other_info + from pg_catalog.pg_proc p join pg_catalog.pg_namespace n + on p.pronamespace = n.oid join pg_catalog.pg_type t + on p.prorettype = t.oid join pg_catalog.pg_language lng + ON lng.oid=p.prolang + WHERE p.prokind IN ('f', 'w', 'p') + AND CASE + WHEN t.typname IN ('trigger', 'event_trigger') THEN lng.lanname NOT IN ('edbspl', 'sql', 'internal') + ELSE true + END + AND ({{ CATALOGS.DB_SUPPORT('n') }}) AND p.prokind != 'a' {% endif %} {% if all_obj %} UNION @@ -329,7 +346,6 @@ FROM ( {% if all_obj %} UNION {% endif %} - {% if 'subscription' not in skip_obj_type%} {% if all_obj or obj_type in ['subscription'] %} SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql deleted file mode 100644 index e5ade349e31..00000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/11_plus/search.sql +++ /dev/null @@ -1,621 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('S','v','m') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['table', 'partition'] %} - SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( - WITH RECURSIVE table_path_data as ( - select c.oid as oid, 0 as height, c.relkind, - CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path - from table_path_data order by height desc limit 1 - ) obj_path, n.nspname AS schema_name, - CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} - ELSE {{ show_node_prefs['table'] }} END AS show_node, - NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE c.relkind in ('p','r','t') - {% if obj_type == 'table' %} - AND NOT c.relispartition - {% elif obj_type == 'partition' %} - AND c.relispartition - {% endif %} - AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || - case - when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname - WHEN tab.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select tab.oid as oid, 0 as height, tab.relkind, - CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid='pg_catalog.pg_constraint'::regclass AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function', 'procedure', 'edbfunc', 'edbproc'] %} - SELECT fd.obj_type, fd.obj_name, - CASE - WHEN fd.obj_type = 'function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'procedure' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:procedure.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'trigger_function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:trigger_function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbfunc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbfunc.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbproc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbproc.' || fd.obj_oid ||':/' || fd.obj_name - ELSE NULL - END AS obj_path, - CASE - WHEN fd.obj_type IN ('function', 'procedure', 'trigger_function') THEN fd.schema_name - WHEN fd.obj_type IN ('edbfunc', 'edbproc') THEN fd.next_schema_name - ELSE NULL - END AS schema_name, - CASE - WHEN fd.obj_type = 'function' THEN {{ show_node_prefs['function'] }} - WHEN fd.obj_type = 'procedure' THEN {{ show_node_prefs['procedure'] }} - WHEN fd.obj_type = 'trigger_function' THEN {{ show_node_prefs['trigger_function'] }} - WHEN fd.obj_type = 'edbfunc' THEN {{ show_node_prefs['edbfunc'] }} - WHEN fd.obj_type = 'edbproc' THEN {{ show_node_prefs['edbproc'] }} - ELSE NULL - END AS show_node, other_info - FROM ( - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - WHEN pr.protype = '0'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbfunc' ELSE 'function' END - WHEN pr.protype = '1'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbproc' ELSE 'procedure' END - ELSE null - END::text AS obj_type, pr.proname AS obj_name, pr.oid AS obj_oid, n.oid AS schema_oid, n.nspname AS schema_name, np.oid next_schema_oid, np.nspname next_schema_name, - pg_catalog.pg_get_function_identity_arguments(pr.oid) AS other_info - FROM pg_catalog.pg_proc pr left join pg_catalog.pg_namespace n - ON pr.pronamespace = n.oid left JOIN pg_catalog.pg_namespace np - ON np.oid=n.nspparent left JOIN pg_catalog.pg_type t - ON t.oid = pr.prorettype left JOIN pg_catalog.pg_language l - ON l.oid = pr.prolang - WHERE NOT (t.typname = 'trigger' AND l.lanname = 'edbspl') - AND ({{ CATALOGS.DB_SUPPORT('n') }} AND {{ CATALOGS.DB_SUPPORT('np') }}) AND pr.prokind != 'a' - ) fd - {% if not all_obj %} - WHERE fd.obj_type = '{{ obj_type }}' - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 - and not t.relispartition -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/'|| - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) || - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - when t.relkind = 'm' then ':mview.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if all_obj or obj_type in ['publication'] %} - SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_publication pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if 'subscription' not in skip_obj_type%} -{% if all_obj or obj_type in ['subscription'] %} - SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_subscription pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% endif %} - -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints' AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['synonym'] %} - SELECT 'synonym' AS obj_type, s.synname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:synonym.'||s.oid||':/' || s.synname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['synonym'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_synonym s - JOIN pg_catalog.pg_namespace n ON n.oid=s.synnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['package'] %} - SELECT 'package' AS obj_type, p.nspname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['package'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_namespace p - JOIN pg_catalog.pg_namespace n ON n.oid=p.nspparent - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['edbvar'] %} - SELECT 'edbvar' AS obj_type, v.varname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname || '/:edbvar.'||v.oid||':/' || v.varname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['edbvar'] }} AS show_node, NULL AS other_info - FROM pg_catalog.edb_variable v JOIN pg_catalog.pg_namespace p - ON v.varpackage = p.oid JOIN pg_catalog.pg_namespace n - ON p.nspparent = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('p') }} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_catalog.pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator' AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql deleted file mode 100644 index 859ba45926a..00000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/12_plus/search.sql +++ /dev/null @@ -1,630 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('S','v','m') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['table', 'partition'] %} - SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( - WITH RECURSIVE table_path_data as ( - select c.oid as oid, 0 as height, c.relkind, - CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path - from table_path_data order by height desc limit 1 - ) obj_path, n.nspname AS schema_name, - CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} - ELSE {{ show_node_prefs['table'] }} END AS show_node, - NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE c.relkind in ('p','r','t') - {% if obj_type == 'table' %} - AND NOT c.relispartition - {% elif obj_type == 'partition' %} - AND c.relispartition - {% endif %} - AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || - case - when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname - WHEN tab.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select tab.oid as oid, 0 as height, tab.relkind, - CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid='pg_catalog.pg_constraint'::regclass AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function', 'procedure', 'edbfunc', 'edbproc'] %} - SELECT fd.obj_type, fd.obj_name, - CASE - WHEN fd.obj_type = 'function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'procedure' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:procedure.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'trigger_function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:trigger_function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbfunc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbfunc.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbproc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbproc.' || fd.obj_oid ||':/' || fd.obj_name - ELSE NULL - END AS obj_path, - CASE - WHEN fd.obj_type IN ('function', 'procedure', 'trigger_function') THEN fd.schema_name - WHEN fd.obj_type IN ('edbfunc', 'edbproc') THEN fd.next_schema_name - ELSE NULL - END AS schema_name, - CASE - WHEN fd.obj_type = 'function' THEN {{ show_node_prefs['function'] }} - WHEN fd.obj_type = 'procedure' THEN {{ show_node_prefs['procedure'] }} - WHEN fd.obj_type = 'trigger_function' THEN {{ show_node_prefs['trigger_function'] }} - WHEN fd.obj_type = 'edbfunc' THEN {{ show_node_prefs['edbfunc'] }} - WHEN fd.obj_type = 'edbproc' THEN {{ show_node_prefs['edbproc'] }} - ELSE NULL - END AS show_node, other_info - FROM ( - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - WHEN pr.protype = '0'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbfunc' ELSE 'function' END - WHEN pr.protype = '1'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbproc' ELSE 'procedure' END - ELSE null - END::text AS obj_type, pr.proname AS obj_name, pr.oid AS obj_oid, n.oid AS schema_oid, n.nspname AS schema_name, np.oid next_schema_oid, np.nspname next_schema_name, - pg_catalog.pg_get_function_identity_arguments(pr.oid) AS other_info - FROM pg_catalog.pg_proc pr left join pg_catalog.pg_namespace n - ON pr.pronamespace = n.oid left JOIN pg_catalog.pg_namespace np - ON np.oid=n.nspparent left JOIN pg_catalog.pg_type t - ON t.oid = pr.prorettype left JOIN pg_catalog.pg_language l - ON l.oid = pr.prolang - WHERE NOT (t.typname = 'trigger' AND l.lanname = 'edbspl') - AND ({{ CATALOGS.DB_SUPPORT('n') }} AND {{ CATALOGS.DB_SUPPORT('np') }}) AND pr.prokind != 'a' - ) fd - {% if not all_obj %} - WHERE fd.obj_type = '{{ obj_type }}' - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 - and not t.relispartition -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/'|| - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) || - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger', 'compound_trigger'] %} - select - CASE WHEN tr.tgpackageoid != 0 THEN 'compound_trigger' ELSE 'trigger' END::text AS obj_type, tr.tgname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end || CASE WHEN tr.tgpackageoid != 0 THEN '/:compound_trigger.' ELSE '/:trigger.' END || tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - CASE WHEN tr.tgpackageoid != 0 THEN {{ show_node_prefs['compound_trigger'] }} ELSE {{ show_node_prefs['trigger'] }} END AS show_node, - NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} - {% if obj_type == 'compound_trigger' %} - AND tr.tgpackageoid != 0 - {% elif obj_type == 'trigger' %} - AND tr.tgpackageoid = 0 - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if all_obj or obj_type in ['publication'] %} - SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_publication pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if 'subscription' not in skip_obj_type%} -{% if all_obj or obj_type in ['subscription'] %} - SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_subscription pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% endif %} - -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints' AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['synonym'] %} - SELECT 'synonym' AS obj_type, s.synname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:synonym.'||s.oid||':/' || s.synname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['synonym'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_synonym s - JOIN pg_catalog.pg_namespace n ON n.oid=s.synnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['package'] %} - SELECT 'package' AS obj_type, p.nspname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['package'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_namespace p - JOIN pg_catalog.pg_namespace n ON n.oid=p.nspparent - WHERE p.nspcompoundtrigger = false - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['edbvar'] %} - SELECT 'edbvar' AS obj_type, v.varname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname || '/:edbvar.'||v.oid||':/' || v.varname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['edbvar'] }} AS show_node, NULL AS other_info - FROM pg_catalog.edb_variable v JOIN pg_catalog.pg_namespace p - ON v.varpackage = p.oid JOIN pg_catalog.pg_namespace n - ON p.nspparent = n.oid - WHERE p.nspcompoundtrigger = false - AND {{ CATALOGS.DB_SUPPORT('p') }} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_catalog.pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator' AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql index 9bc1579e47e..859ba45926a 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql @@ -164,7 +164,7 @@ FROM ( ON t.oid = pr.prorettype left JOIN pg_catalog.pg_language l ON l.oid = pr.prolang WHERE NOT (t.typname = 'trigger' AND l.lanname = 'edbspl') - AND ({{ CATALOGS.DB_SUPPORT('n') }} AND {{ CATALOGS.DB_SUPPORT('np') }}) AND NOT pr.proisagg + AND ({{ CATALOGS.DB_SUPPORT('n') }} AND {{ CATALOGS.DB_SUPPORT('np') }}) AND pr.prokind != 'a' ) fd {% if not all_obj %} WHERE fd.obj_type = '{{ obj_type }}' @@ -297,11 +297,12 @@ FROM ( {% if all_obj %} UNION {% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || +{% if all_obj or obj_type in ['trigger', 'compound_trigger'] %} + select + CASE WHEN tr.tgpackageoid != 0 THEN 'compound_trigger' ELSE 'trigger' END::text AS obj_type, tr.tgname AS obj_name, + ':schema.'||n.oid||':/' || n.nspname|| '/' || case when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - when t.relkind = 'm' then ':mview.' || t.oid || ':' || '/' || t.relname WHEN t.relkind in ('r', 't', 'p') THEN ( WITH RECURSIVE table_path_data as ( @@ -318,13 +319,19 @@ FROM ( select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path from table_path_data order by height desc limit 1 ) - end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info + end || CASE WHEN tr.tgpackageoid != 0 THEN '/:compound_trigger.' ELSE '/:trigger.' END || tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, + CASE WHEN tr.tgpackageoid != 0 THEN {{ show_node_prefs['compound_trigger'] }} ELSE {{ show_node_prefs['trigger'] }} END AS show_node, + NULL AS other_info from pg_catalog.pg_trigger tr inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where tr.tgisinternal = false and {{ CATALOGS.DB_SUPPORT('n') }} + {% if obj_type == 'compound_trigger' %} + AND tr.tgpackageoid != 0 + {% elif obj_type == 'trigger' %} + AND tr.tgpackageoid = 0 + {% endif %} {% endif %} {% if all_obj %} UNION @@ -531,7 +538,8 @@ FROM ( {{ show_node_prefs['package'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_namespace p JOIN pg_catalog.pg_namespace n ON n.oid=p.nspparent - WHERE {{ CATALOGS.DB_SUPPORT('n') }} + WHERE p.nspcompoundtrigger = false + AND {{ CATALOGS.DB_SUPPORT('n') }} {% endif %} {% if all_obj %} UNION @@ -543,7 +551,8 @@ FROM ( FROM pg_catalog.edb_variable v JOIN pg_catalog.pg_namespace p ON v.varpackage = p.oid JOIN pg_catalog.pg_namespace n ON p.nspparent = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('p') }} + WHERE p.nspcompoundtrigger = false + AND {{ CATALOGS.DB_SUPPORT('p') }} AND {{ CATALOGS.DB_SUPPORT('n') }} {% endif %} {% if all_obj %} diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/11_plus/primary_keys.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/11_plus/primary_keys.sql deleted file mode 100644 index 2e51b364140..00000000000 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/11_plus/primary_keys.sql +++ /dev/null @@ -1,19 +0,0 @@ -SELECT at.attname, at.attnum, ty.typname -FROM pg_catalog.pg_attribute at LEFT JOIN pg_catalog.pg_type ty ON (ty.oid = at.atttypid) -JOIN pg_catalog.pg_class as cl ON cl.oid=AT.attrelid -JOIN pg_catalog.pg_namespace as nsp ON nsp.oid=cl.relnamespace -WHERE -{% if obj_id %} - attrelid={{obj_id}}::oid AND -{% elif table_name and table_nspname %} - cl.relname = {{table_name|qtLiteral(conn)}} AND nsp.nspname={{table_nspname|qtLiteral(conn)}} AND -{% endif %} -attnum = ANY ( -(SELECT con.conkey FROM pg_catalog.pg_class rel LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid -JOIN pg_catalog.pg_namespace as nsp ON nsp.oid=REL.relnamespace -AND con.contype='p' WHERE rel.relkind IN ('r','s','t', 'p') AND -{% if obj_id %} - rel.oid = ({{obj_id}})::oid -{% elif table_name and table_nspname%} - rel.relname = {{table_name|qtLiteral(conn)}} AND nsp.nspname={{table_nspname|qtLiteral(conn)}} -{% endif %})::oid[]) diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/12_plus/explain_plan.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/12_plus/explain_plan.sql deleted file mode 100644 index 88ce9c91661..00000000000 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/12_plus/explain_plan.sql +++ /dev/null @@ -1,18 +0,0 @@ -{% import 'sql/macros/utils.macros' as UTILS %} -EXPLAIN ({% if format -%} - FORMAT {{ format.upper() }} -{%- endif %}{% if analyze is defined -%} - , ANALYZE {{ UTILS.BOOL_TEXT(analyze) }} -{%- endif %}{% if verbose is defined -%} - , VERBOSE {{ UTILS.BOOL_TEXT(verbose) }} -{%- endif %}{% if costs is defined -%} - , COSTS {{ UTILS.BOOL_TEXT(costs) }} -{%- endif %}{% if timing is defined -%} - , TIMING {{ UTILS.BOOL_TEXT(timing) }} -{%- endif %}{% if buffers is defined -%} - , BUFFERS {{ UTILS.BOOL_TEXT(buffers) }} -{%- endif %}{% if summary is defined -%} - , SUMMARY {{ UTILS.BOOL_TEXT(summary) }} -{%- endif %}{% if settings is defined -%} - , SETTINGS {{ UTILS.BOOL_TEXT(settings) }} -{%- endif %}) {{ sql }} diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/13_plus/explain_plan.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/13_plus/explain_plan.sql deleted file mode 100644 index 6c59274ba8e..00000000000 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/13_plus/explain_plan.sql +++ /dev/null @@ -1,20 +0,0 @@ -{% import 'sql/macros/utils.macros' as UTILS %} -EXPLAIN ({% if format -%} - FORMAT {{ format.upper() }} -{%- endif %}{% if analyze is defined -%} - , ANALYZE {{ UTILS.BOOL_TEXT(analyze) }} -{%- endif %}{% if verbose is defined -%} - , VERBOSE {{ UTILS.BOOL_TEXT(verbose) }} -{%- endif %}{% if costs is defined -%} - , COSTS {{ UTILS.BOOL_TEXT(costs) }} -{%- endif %}{% if timing is defined -%} - , TIMING {{ UTILS.BOOL_TEXT(timing) }} -{%- endif %}{% if buffers is defined -%} - , BUFFERS {{ UTILS.BOOL_TEXT(buffers) }} -{%- endif %}{% if summary is defined -%} - , SUMMARY {{ UTILS.BOOL_TEXT(summary) }} -{%- endif %}{% if settings is defined -%} - , SETTINGS {{ UTILS.BOOL_TEXT(settings) }} -{%- endif %}{% if wal is defined -%} - , WAL {{ UTILS.BOOL_TEXT(wal) }} -{%- endif %}) {{ sql }} diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql index 5b30a13eeed..6c59274ba8e 100644 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql +++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql @@ -13,4 +13,8 @@ EXPLAIN ({% if format -%} , BUFFERS {{ UTILS.BOOL_TEXT(buffers) }} {%- endif %}{% if summary is defined -%} , SUMMARY {{ UTILS.BOOL_TEXT(summary) }} +{%- endif %}{% if settings is defined -%} + , SETTINGS {{ UTILS.BOOL_TEXT(settings) }} +{%- endif %}{% if wal is defined -%} + , WAL {{ UTILS.BOOL_TEXT(wal) }} {%- endif %}) {{ sql }} diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql index 1ccb701af40..2e51b364140 100644 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql +++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/primary_keys.sql @@ -11,7 +11,7 @@ WHERE attnum = ANY ( (SELECT con.conkey FROM pg_catalog.pg_class rel LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid JOIN pg_catalog.pg_namespace as nsp ON nsp.oid=REL.relnamespace -AND con.contype='p' WHERE rel.relkind IN ('r','s','t') AND +AND con.contype='p' WHERE rel.relkind IN ('r','s','t', 'p') AND {% if obj_id %} rel.oid = ({{obj_id}})::oid {% elif table_name and table_nspname%} diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py index d2cbd75d7e3..adbba1d7ee7 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py @@ -20,7 +20,7 @@ class TestExplainPlanTemplates(BaseTestGenerator): scenarios = [ ( - 'When rendering Postgres 10 template, ' + 'When rendering the default template, ' 'when summary is present,' 'it returns the explain plan with summary', dict( @@ -40,11 +40,11 @@ class TestExplainPlanTemplates(BaseTestGenerator): ) ), ( - 'When rendering Postgres 12 template, ' + 'When rendering the default template, ' 'when settings is present,' 'it returns the explain plan with settings', dict( - template_path='sqleditor/sql/12_plus/explain_plan.sql', + template_path='sqleditor/sql/default/explain_plan.sql', input_parameters=dict( sql='SELECT * FROM places', format='json', @@ -62,11 +62,11 @@ class TestExplainPlanTemplates(BaseTestGenerator): ) ), ( - 'When rendering Postgres 13 template, ' + 'When rendering the default template, ' 'when wal is present,' 'it returns the explain plan with wal', dict( - template_path='sqleditor/sql/13_plus/explain_plan.sql', + template_path='sqleditor/sql/default/explain_plan.sql', input_parameters=dict( sql='SELECT * FROM places', format='json',