Fixes sql re-tests for PG11 #8969

mzabuawala · mzabuawala · commit 1f69be39d210 · 2025-07-22T00:07:09.000+05:30
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
@@ -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/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
@@ -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/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,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=100, deduplicate_items=True)
+    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_asc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/11_plus/create_btree_asc_null_first.sql
@@ -6,7 +6,7 @@ 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=True)
+    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/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
@@ -2,7 +2,7 @@ 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=True)
+    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/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
@@ -6,7 +6,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)
     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/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, deduplicate_items=True)
+    WITH (fillfactor=100)
     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
@@ -6,7 +6,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)
     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/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
@@ -2,7 +2,7 @@ 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=True)
+    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/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
@@ -6,9 +6,9 @@ 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;
 
 COMMENT ON INDEX public."Idx3_$%{}[]()&*^!@""'`\/#"
-    IS 'Test Comment';
+    IS 'Test Comment';
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
@@ -0,0 +1,14 @@
+-- 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, deduplicate_items=True)
+    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
@@ -0,0 +1,16 @@
+-- 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, deduplicate_items=True)
+    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
@@ -0,0 +1,13 @@
+-- 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=100, deduplicate_items=True)
+    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_desc_null_first.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/tests/13_plus/create_btree_desc_null_first.sql
@@ -0,0 +1,10 @@
+-- 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=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
@@ -0,0 +1,14 @@
+-- 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, deduplicate_items=True)
+    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/templates/indexes/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/properties.sql
@@ -47,13 +47,6 @@ SELECT DISTINCT ON (cls.relname)
             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
