diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index 205f7e10b69..42a488a5824 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -517,8 +517,7 @@ def _fetch_properties(self, did, tid, idx): "/".join([self.template_path, self._PROPERTIES_SQL]), did=did, tid=tid, idx=idx, datlastsysoid=self._DATABASE_LAST_SYSTEM_OID, - show_sys_objects=self.blueprint.show_system_objects - ) + show_sys_objects=self.blueprint.show_system_objects) status, res = self.conn.execute_dict(SQL) if not status: @@ -724,8 +723,7 @@ def delete(self, gid, sid, did, scid, tid, **kwargs): "/".join([self.template_path, self._PROPERTIES_SQL]), did=did, tid=tid, idx=idx, datlastsysoid=self._DATABASE_LAST_SYSTEM_OID, - show_sys_objects=self.blueprint.show_system_objects - ) + show_sys_objects=self.blueprint.show_system_objects) status, res = self.conn.execute_dict(SQL) if not status: @@ -879,8 +877,7 @@ def sql(self, gid, sid, did, scid, tid, idx): self.conn, schema=self.schema, table=self.table, did=did, tid=tid, idx=idx, datlastsysoid=self._DATABASE_LAST_SYSTEM_OID, add_not_exists_clause=True, - show_sys_objects=self.blueprint.show_system_objects - ) + show_sys_objects=self.blueprint.show_system_objects) return ajax_response(response=SQL) @@ -1010,8 +1007,7 @@ def statistics(self, gid, sid, did, scid, tid, idx=None): "/".join([self.template_path, self._PROPERTIES_SQL]), did=did, tid=tid, idx=idx, datlastsysoid=self._DATABASE_LAST_SYSTEM_OID, - show_sys_objects=self.blueprint.show_system_objects - ) + show_sys_objects=self.blueprint.show_system_objects) status, res = self.conn.execute_dict(SQL) if not status: return internal_server_error(errormsg=res) 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 index 89891dc4231..d8c7cd5c5a3 100644 --- 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 @@ -6,7 +6,6 @@ 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=100) TABLESPACE pg_default; COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" 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 index 329cc493d8a..edbf94695cc 100644 --- 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 @@ -6,5 +6,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) - WITH (fillfactor=100) + WITH (fillfactor=90) TABLESPACE pg_default; 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 index 0565da209c2..f7c25eae1f2 100644 --- 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 @@ -6,7 +6,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, deduplicate_items=True) + 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/alter_name_fillfactor_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/alter_name_fillfactor_comment.sql index bd26995dfb0..b25e51fe7e9 100644 --- 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 @@ -6,7 +6,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) - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default; ALTER TABLE IF EXISTS public.test_table_for_indexes 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 index 562e2f5b4e8..d8c7cd5c5a3 100644 --- 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 @@ -6,7 +6,6 @@ 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=100, deduplicate_items=True) TABLESPACE pg_default; COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" 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 index a3a7314274d..d7f87ff1081 100644 --- 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 @@ -6,5 +6,4 @@ 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=100, deduplicate_items=True) TABLESPACE pg_default; 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 index 0565da209c2..f7c25eae1f2 100644 --- 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 @@ -6,7 +6,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, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_name_fillfactor_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_name_fillfactor_comment.sql index 7e1b3b28a7d..fc068ba3def 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_name_fillfactor_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_name_fillfactor_comment.sql @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) INCLUDE(name, id) NULLS NOT DISTINCT - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default; ALTER TABLE IF EXISTS public.test_table_for_indexes diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_reset_fillfactor_cluster.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_reset_fillfactor_cluster.sql index ad9e9041265..f429e8358d2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_reset_fillfactor_cluster.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/alter_reset_fillfactor_cluster.sql @@ -7,7 +7,6 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx1_$%{}[]()&*^!@""'`\/#" (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) INCLUDE(name, id) NULLS NOT DISTINCT - WITH (fillfactor=100, deduplicate_items=True) TABLESPACE pg_default; COMMENT ON INDEX public."Idx1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_first.sql index cd8186547f7..802e195002b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_first.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_first.sql @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" (id ASC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS FIRST) INCLUDE(name, id) NULLS NOT DISTINCT - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_last.sql index c4cbb01456c..2cf9c9e3a37 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_last.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_asc_null_last.sql @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" (id ASC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops ASC NULLS LAST) INCLUDE(name, id) NULLS NOT DISTINCT - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_first.sql index a9e1019d973..6f6c8cd77fc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_first.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_first.sql @@ -7,5 +7,4 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" (id DESC NULLS FIRST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS FIRST) INCLUDE(name, id) NULLS NOT DISTINCT - WITH (fillfactor=100, deduplicate_items=True) TABLESPACE pg_default; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_last.sql index 9507fd64760..56ed7687856 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_last.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/15_plus/create_btree_desc_null_last.sql @@ -7,7 +7,7 @@ CREATE UNIQUE INDEX IF NOT EXISTS "Idx_$%{}[]()&*^!@""'`\/#" (id DESC NULLS LAST, name COLLATE pg_catalog."POSIX" text_pattern_ops DESC NULLS LAST) INCLUDE(name, id) NULLS NOT DISTINCT - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; 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 d85d42c14b2..51c1afec95b 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,7 +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) - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; 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 418d34eb833..5b3809ce35b 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,7 +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) - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default; ALTER TABLE IF EXISTS public.test_table_for_indexes 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 c457355c35d..3960455dbab 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,7 @@ 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, deduplicate_items=True) + 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_desc_null_last.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/default/create_btree_desc_null_last.sql index 763f4164236..90766406404 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,7 @@ 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, deduplicate_items=True) + 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 a6bdce0ce87..53c401357a6 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,7 +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) - WITH (fillfactor=10, deduplicate_items=True) + WITH (fillfactor=10) TABLESPACE pg_default WHERE id < 100; 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 index b2129f84c1b..94509e84594 100644 --- 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 @@ -38,54 +38,13 @@ SELECT DISTINCT ON (cls.relname) EXISTS ( SELECT 1 FROM pg_inherits inh WHERE inh.inhrelid = cls.oid ) AS is_inherited, - -- Options (with defaults per index type) - COALESCE( - substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int, - CASE am.amname - WHEN 'btree' THEN 100 - WHEN 'gist' THEN 90 - ELSE NULL - END - ) AS fillfactor, - COALESCE( - CASE am.amname - WHEN 'gin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int - ELSE NULL - END, - CASE am.amname WHEN 'gin' THEN 4096 * 1024 ELSE NULL END - ) AS gin_pending_list_limit, - COALESCE( - CASE am.amname - WHEN 'brin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'pages_per_range=([0-9]*)')::int - ELSE NULL - END, - CASE am.amname WHEN 'brin' THEN 128 ELSE NULL END - ) AS pages_per_range, - COALESCE( - CASE am.amname - WHEN 'gist' THEN substring(array_to_string(cls.reloptions, ',') FROM 'buffering=([a-z]*)') - ELSE NULL - END, - CASE am.amname WHEN 'gist' THEN 'auto' ELSE NULL END - ) AS buffering, - COALESCE( - CASE am.amname - WHEN 'gin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'fastupdate=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'gin' THEN TRUE ELSE NULL END - ) AS fastupdate, - COALESCE( - CASE am.amname - WHEN 'brin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'autosummarize=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'brin' THEN FALSE ELSE NULL END - ) AS autosummarize, - COALESCE( - substring(array_to_string(cls.reloptions, ',') FROM 'lists=([0-9]*)')::int, - NULL - ) AS lists + 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 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 index 2ce7f9d2410..0e6140869e1 100644 --- 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 @@ -45,60 +45,14 @@ SELECT DISTINCT ON (cls.relname) SELECT 1 FROM pg_inherits inh WHERE inh.inhrelid = cls.oid ) AS is_inherited, -- Options (with defaults per index type) - COALESCE( - substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int, - CASE am.amname - WHEN 'btree' THEN 100 - WHEN 'gist' THEN 90 - ELSE NULL - END - ) AS fillfactor, - COALESCE( - CASE am.amname - WHEN 'btree' THEN substring(array_to_string(cls.reloptions, ',') FROM 'deduplicate_items=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'btree' THEN TRUE ELSE NULL END - ) AS deduplicate_items, - COALESCE( - CASE am.amname - WHEN 'gin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int - ELSE NULL - END, - CASE am.amname WHEN 'gin' THEN 4096 * 1024 ELSE NULL END - ) AS gin_pending_list_limit, - COALESCE( - CASE am.amname - WHEN 'brin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'pages_per_range=([0-9]*)')::int - ELSE NULL - END, - CASE am.amname WHEN 'brin' THEN 128 ELSE NULL END - ) AS pages_per_range, - COALESCE( - CASE am.amname - WHEN 'gist' THEN substring(array_to_string(cls.reloptions, ',') FROM 'buffering=([a-z]*)') - ELSE NULL - END, - CASE am.amname WHEN 'gist' THEN 'auto' ELSE NULL END - ) AS buffering, - COALESCE( - CASE am.amname - WHEN 'gin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'fastupdate=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'gin' THEN TRUE ELSE NULL END - ) AS fastupdate, - COALESCE( - CASE am.amname - WHEN 'brin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'autosummarize=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'brin' THEN FALSE ELSE NULL END - ) AS autosummarize, - COALESCE( - substring(array_to_string(cls.reloptions, ',') FROM 'lists=([0-9]*)')::int, - NULL - ) AS lists + 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 %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql index 9b9be97c8f5..b2b99066811 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/15_plus/properties.sql @@ -46,60 +46,14 @@ SELECT DISTINCT ON (cls.relname) SELECT 1 FROM pg_inherits inh WHERE inh.inhrelid = cls.oid ) AS is_inherited, -- Options (with defaults per index type) - COALESCE( - substring(array_to_string(cls.reloptions, ',') FROM 'fillfactor=([0-9]*)')::int, - CASE am.amname - WHEN 'btree' THEN 100 - WHEN 'gist' THEN 90 - ELSE NULL - END - ) AS fillfactor, - COALESCE( - CASE am.amname - WHEN 'btree' THEN substring(array_to_string(cls.reloptions, ',') FROM 'deduplicate_items=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'btree' THEN TRUE ELSE NULL END - ) AS deduplicate_items, - COALESCE( - CASE am.amname - WHEN 'gin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'gin_pending_list_limit=([0-9]*)')::int - ELSE NULL - END, - CASE am.amname WHEN 'gin' THEN 4096 * 1024 ELSE NULL END - ) AS gin_pending_list_limit, - COALESCE( - CASE am.amname - WHEN 'brin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'pages_per_range=([0-9]*)')::int - ELSE NULL - END, - CASE am.amname WHEN 'brin' THEN 128 ELSE NULL END - ) AS pages_per_range, - COALESCE( - CASE am.amname - WHEN 'gist' THEN substring(array_to_string(cls.reloptions, ',') FROM 'buffering=([a-z]*)') - ELSE NULL - END, - CASE am.amname WHEN 'gist' THEN 'auto' ELSE NULL END - ) AS buffering, - COALESCE( - CASE am.amname - WHEN 'gin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'fastupdate=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'gin' THEN TRUE ELSE NULL END - ) AS fastupdate, - COALESCE( - CASE am.amname - WHEN 'brin' THEN substring(array_to_string(cls.reloptions, ',') FROM 'autosummarize=([a-z]*)')::boolean - ELSE NULL - END, - CASE am.amname WHEN 'brin' THEN FALSE ELSE NULL END - ) AS autosummarize, - COALESCE( - substring(array_to_string(cls.reloptions, ',') FROM 'lists=([0-9]*)')::int, - NULL - ) AS lists + 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]*)')::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 %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 806f5290481..0c9d3f5a483 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -757,8 +757,7 @@ def _get_resql_for_index(self, did, tid, main_sql, json_resp, schema, self.conn, schema=schema, table=table, did=did, tid=tid, idx=row['oid'], datlastsysoid=self._DATABASE_LAST_SYSTEM_OID, template_path=None, with_header=json_resp, - add_not_exists_clause=add_not_exists_clause - ) + add_not_exists_clause=add_not_exists_clause) index_sql = "\n" + index_sql # Add into main sql @@ -1002,8 +1001,9 @@ def _get_resql_for_partitions(self, data, rset, json_resp, partition_sql_arr.append(partition_main_sql) # Get Reverse engineered sql for index - self._get_resql_for_index(did, row['oid'], partition_sql_arr, - json_resp, schema, table) + self._get_resql_for_index( + did, row['oid'], partition_sql_arr, + json_resp, schema, table) # Get Reverse engineered sql for ROW SECURITY POLICY self._get_resql_for_row_security_policy(scid, row['oid'],