diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py index ece195e87..fb5c6d660 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py @@ -414,7 +414,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare): pub_table.append(table['table_name']) res['rows'][0]['pubtable'] = pub_table - res['rows'][0]['pubtable_names'] = pub_table_names_list + res['rows'][0]['pubtable_names'] = ', '.join(pub_table_names_list) return True, res['rows'][0] diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js b/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js index 669506215..aeadf58d9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js +++ b/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js @@ -161,7 +161,7 @@ export default class PublicationSchema extends BaseUISchema { name: undefined, pubowner: (node_info) ? node_info['node_info']?.user.name: undefined, pubtable: [], - pubtable_names: [], + pubtable_names: '', pubschema: undefined, all_table: false, evnt_insert:true, @@ -282,15 +282,7 @@ export default class PublicationSchema extends BaseUISchema { min_version: 150000, }, { - id: 'pubtable_names', label: gettext('Tables'), cell: 'string', - type: (state)=>{ - let table= (!_.isUndefined(state?.pubtable_names) && state?.pubtable_names.length > 0) ? state?.pubtable_names : []; - return { - type: 'select', - options: table, - controlProps: { allowClear: true, multiple: true, creatable: true }, - }; - }, + id: 'pubtable_names', label: gettext('Tables'), type: 'text', group: gettext('Tables'), mode: ['properties'], deps: ['all_table'], disabled: obj.isAllTable, }, diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py index a7aed2a90..529df57ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py @@ -187,6 +187,11 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare): 't': True, 'f': False } + two_phase_mapping = { + 'p': True, + 'e': True, + 'd': False + } parent_ids = [ {'type': 'int', 'id': 'gid'}, @@ -377,6 +382,10 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare): if len(res['rows']) == 0: return False, gone(self._NOT_FOUND_PUB_INFORMATION) + if self.manager.version >= 150000: + res['rows'][0]['two_phase'] = \ + self.two_phase_mapping[res['rows'][0]['two_phase']] + if self.manager.version >= 160000: res['rows'][0]['streaming'] = \ self.streaming_mapping[res['rows'][0]['streaming']] @@ -478,7 +487,7 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare): sql = render_template( "/".join([self.template_path, 'get_position.sql']), - conn=self.conn, subname=data['name'] + conn=self.conn, subname=data['name'], did=did ) status, r_set = self.conn.execute_dict(sql) @@ -787,6 +796,10 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare): else: old_data['connect'] = False + if self.manager.version >= 150000: + old_data['two_phase'] = \ + self.two_phase_mapping[old_data['two_phase']] + if self.manager.version >= 160000: old_data['streaming'] = \ self.streaming_mapping[old_data['streaming']] diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js index 1bf18538d..97f626396 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js @@ -75,6 +75,8 @@ export default class SubscriptionSchema extends BaseUISchema{ if (host == this.node_info['node_info'].host && port == this.node_info['node_info'].port){ state.create_slot = false; return true; + } else { + state.create_slot = true; } return false; } @@ -96,7 +98,6 @@ export default class SubscriptionSchema extends BaseUISchema{ } isRefresh(state){ if (!state.refresh_pub || _.isUndefined(state.refresh_pub)){ - state.copy_data_after_refresh = false; return true; } return false; @@ -332,7 +333,10 @@ export default class SubscriptionSchema extends BaseUISchema{ if (state.enabled) return false; state.refresh_pub = false; + state.copy_data_after_refresh = false; return true; + }, depChange: (state)=>{ + state.copy_data_after_refresh = state.refresh_pub ? state.copy_data_after_refresh ? false : true : false; }, },{ id: 'connect', label: gettext('Connect?'), 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 index 705c3b5bd..154d602df 100644 --- 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 @@ -19,6 +19,6 @@ CREATE SUBSCRIPTION {{ conn|qtIdent(data.name) }} 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 %}copy_data = {{ data.copy_data|lower}}{% if add_semicolon_after_copy_data == 'copy_data' %}, {% endif %}{% 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/15_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/15_plus/create.sql index ef25a2a5d..4e4193709 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/15_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/15_plus/create.sql @@ -19,6 +19,6 @@ CREATE SUBSCRIPTION {{ conn|qtIdent(data.name) }} 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 %}copy_data = {{ data.copy_data|lower}}{% if add_semicolon_after_copy_data == 'copy_data' %}, {% endif %}{% 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}}', two_phase = {{ data.two_phase|lower}}, disable_on_error = {{ data.disable_on_error|lower}}); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/16_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/16_plus/create.sql index 8052a4782..10694aa99 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/16_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/16_plus/create.sql @@ -19,6 +19,6 @@ CREATE SUBSCRIPTION {{ conn|qtIdent(data.name) }} 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 %}copy_data = {{ data.copy_data|lower}}{% if add_semicolon_after_copy_data == 'copy_data' %}, {% endif %}{% 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}}', two_phase = {{ data.two_phase|lower}}, disable_on_error = {{ data.disable_on_error|lower}}, run_as_owner = {{ data.run_as_owner|lower}}, password_required = {{ data.password_required|lower}}, origin = '{{ data.origin}}'); 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 31bf109f5..46029421a 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 @@ -19,6 +19,6 @@ CREATE SUBSCRIPTION {{ conn|qtIdent(data.name) }} 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 %}copy_data = {{ data.copy_data|lower}}{% if add_semicolon_after_copy_data == 'copy_data' %}, {% endif %}{% 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 %}); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/get_position.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/get_position.sql index 78287c83a..5ddf72a3f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/get_position.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/templates/subscriptions/sql/default/get_position.sql @@ -1 +1 @@ -SELECT oid, subname AS name FROM pg_catalog.pg_subscription WHERE subname = '{{ subname }}'; +SELECT oid, subname AS name FROM pg_catalog.pg_subscription WHERE subname = '{{ subname }}' and subdbid={{did}} :: oid; 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 index ac86bc287..4283809e1 100644 --- 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 @@ -1,4 +1,4 @@ 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, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True'); + 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 index 7d1823723..b3130fa0a 100644 --- 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 @@ -36,11 +36,13 @@ "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_sql_file": "alter_parameters.sql", + "expected_msql_file": "alter_parameters_msql.sql" }, { "type": "delete", diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/alter_parameters.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/alter_parameters.sql index 5c1744ec2..d1f039da9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/alter_parameters.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/alter_parameters.sql @@ -5,4 +5,4 @@ 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 = 'off', binary = false, streaming = 'False', two_phase = p, disable_on_error = false); + WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'off', binary = false, streaming = 'False', two_phase = true, disable_on_error = false); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription.sql index 7b6726ea0..1cfa6b573 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription.sql @@ -5,4 +5,4 @@ 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', two_phase = p, disable_on_error = true); + WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription_msql.sql index d79502293..7efd2be77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/create_subscription_msql.sql @@ -1,4 +1,4 @@ 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, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true); + WITH (connect = false, enabled = false, copy_data = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/test.json index e954d9c3d..a395070b3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/15_plus/test.json @@ -37,6 +37,7 @@ "name": "Alter parameters of subscription", "endpoint": "NODE-subscription.obj_id", "sql_endpoint": "NODE-subscription.sql_id", + "msql_endpoint": "NODE-subscription.msql_id", "data": { "sync": "off", "binary": false, diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/alter_parameters.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/alter_parameters.sql index 0f78115c7..7730e3680 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/alter_parameters.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/alter_parameters.sql @@ -5,4 +5,4 @@ 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 = 'off', binary = false, streaming = 'False', two_phase = p, disable_on_error = false, run_as_owner = true, password_required = true, origin = 'none'); + WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'off', binary = false, streaming = 'False', two_phase = true, disable_on_error = false, run_as_owner = true, password_required = true, origin = 'none'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription.sql index d9f8af987..98131ec1d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription.sql @@ -5,4 +5,4 @@ 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', two_phase = p, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any'); + WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription_msql.sql index 9951523a5..b9cb24256 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/create_subscription_msql.sql @@ -1,4 +1,4 @@ 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, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any'); + WITH (connect = false, enabled = false, copy_data = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply', binary = true, streaming = 'True', two_phase = true, disable_on_error = true, run_as_owner = true, password_required = true, origin = 'any'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/test.json index 86b66982a..b7c119a19 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/test.json +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/16_plus/test.json @@ -40,6 +40,7 @@ "name": "Alter parameters of subscription", "endpoint": "NODE-subscription.obj_id", "sql_endpoint": "NODE-subscription.sql_id", + "msql_endpoint": "NODE-subscription.msql_id", "data": { "sync": "off", "binary": false, diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db.sql index a0212a5a9..f47c11ce2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db.sql @@ -3,6 +3,6 @@ -- DROP SUBSCRIPTION IF EXISTS test_alter_subscription; CREATE SUBSCRIPTION test_alter_subscription - CONNECTION 'host=localhost port=5432 user=postgres dbname=edb' + CONNECTION 'host=localhost port=5432 user=postgres dbname=edb connect_timeout=10 sslmode=prefer' PUBLICATION sample__1 WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'remote_apply'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db_msql.sql index b106778b8..c15a14890 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db_msql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_maintenance_db_msql.sql @@ -1,2 +1,2 @@ ALTER SUBSCRIPTION test_alter_subscription - CONNECTION 'host=localhost port=5432 user=postgres dbname=edb'; + CONNECTION 'host=localhost port=5432 user=postgres dbname=edb connect_timeout=10 sslmode=prefer'; diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_subscription.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_subscription.sql index 51c328288..0abca07a2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_subscription.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_subscription.sql @@ -3,6 +3,6 @@ -- DROP SUBSCRIPTION IF EXISTS test_alter_subscription; CREATE SUBSCRIPTION test_alter_subscription - CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres' + 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'); diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_sync.sql b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_sync.sql index c3bdeca0d..13fd3c7b8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_sync.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/tests/default/alter_sync.sql @@ -3,6 +3,6 @@ -- DROP SUBSCRIPTION IF EXISTS test_alter_subscription; CREATE SUBSCRIPTION test_alter_subscription - CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres' + 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 = 'remote_apply'); 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 3c1178a7b..cf2cad365 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' + 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'); 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 a67a28807..584e3856e 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 password=xxxxxx' + CONNECTION 'host=localhost port=5432 user=postgres dbname=postgres connect_timeout=10 password=xxxxxx sslmode=prefer' PUBLICATION sample__1 - WITH (connect = false, enabled = false, create_slot = false, slot_name = None, synchronous_commit = 'off'); + WITH (connect = false, enabled = false, copy_data = false, create_slot = false, slot_name = None, synchronous_commit = 'off'); 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 30c2f831d..ff907db37 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 @@ -21,6 +21,8 @@ "port": 5432, "password": "edb", "sync": "off", + "connect_timeout": 10, + "sslmode": "prefer", "pub": ["sample__1"] }, "expected_sql_file": "create_subscription.sql", @@ -31,6 +33,7 @@ "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" }, @@ -42,6 +45,7 @@ "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" }, @@ -54,6 +58,7 @@ "name": "Alter maintainance DB in connection string of subscription", "endpoint": "NODE-subscription.obj_id", "sql_endpoint": "NODE-subscription.sql_id", + "msql_endpoint": "NODE-subscription.msql_id", "data": { "db": "edb" },