Simplify test_create_extension

arenadata · Nov 22, 2024 · 61779eb · 61779eb
1 parent d24ee4d
commit 61779eb
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 105 deletions.
diff --git a/tests/isolation2/expected/test_create_extension.out b/tests/isolation2/expected/test_create_extension.out
@@ -1,23 +1,18 @@
 -- check that diskquota ignores global flag appendonly=true
 
--- for GPDB 6
-SET gp_default_storage_options='appendonly=true';
-SET
--- for GPDB 7
-SET default_table_access_method='ao_row';
-ERROR:  unrecognized configuration parameter "default_table_access_method"
+-- start_matchsubs
+-- m/CREATE EXTENSION$/
+-- s/CREATE EXTENSION$/CREATE/
+-- m/DROP EXTENSION$/
+-- s/DROP EXTENSION$/DROP/
+-- end_matchsubs
+
 
 CREATE EXTENSION diskquota;
 CREATE
 DROP EXTENSION diskquota;
 DROP
 
--- for GPDB 6
-SET gp_default_storage_options='appendonly=false';
-SET
--- for GPDB 7
-SET default_table_access_method='heap';
-ERROR:  unrecognized configuration parameter "default_table_access_method"
 
 CREATE EXTENSION diskquota;
 CREATE

diff --git a/tests/isolation2/expected7/test_create_extension.out b/tests/isolation2/expected7/test_create_extension.out
diff --git a/tests/isolation2/sql/test_create_extension.sql b/tests/isolation2/sql/test_create_extension.sql
@@ -1,17 +1,30 @@
 -- check that diskquota ignores global flag appendonly=true
 
--- for GPDB 6
-SET gp_default_storage_options='appendonly=true';
--- for GPDB 7
-SET default_table_access_method='ao_row';
+-- start_matchsubs
+-- m/CREATE EXTENSION$/
+-- s/CREATE EXTENSION$/CREATE/
+-- m/DROP EXTENSION$/
+-- s/DROP EXTENSION$/DROP/
+-- end_matchsubs
+
+-- start_ignore
+SELECT CASE
+    WHEN current_setting('server_version_num')::int > 120000
+    THEN set_config('default_table_access_method', 'ao_row', false)
+    ELSE set_config('gp_default_storage_options', 'appendonly=true', false)
+END;
+-- end_ignore
 
 CREATE EXTENSION diskquota;
 DROP EXTENSION diskquota;
 
--- for GPDB 6
-SET gp_default_storage_options='appendonly=false';
--- for GPDB 7
-SET default_table_access_method='heap';
+-- start_ignore
+SELECT CASE
+    WHEN current_setting('server_version_num')::int > 120000
+    THEN set_config('default_table_access_method', 'heap', false)
+    ELSE set_config('gp_default_storage_options', 'appendonly=false', false)
+END;
+-- end_ignore
 
 CREATE EXTENSION diskquota;
 

diff --git a/tests/regress/expected/test_create_extension.out b/tests/regress/expected/test_create_extension.out
@@ -1,16 +1,12 @@
 -- check that diskquota ignores global flag appendonly=true
--- for GPDB 6
-SET gp_default_storage_options='appendonly=true';
--- for GPDB 7
-SET default_table_access_method='ao_row';
-ERROR:  unrecognized configuration parameter "default_table_access_method"
+-- start_matchsubs
+-- m/CREATE EXTENSION$/
+-- s/CREATE EXTENSION$/CREATE/
+-- m/DROP EXTENSION$/
+-- s/DROP EXTENSION$/DROP/
+-- end_matchsubs
 CREATE EXTENSION diskquota;
 DROP EXTENSION diskquota;
--- for GPDB 6
-SET gp_default_storage_options='appendonly=false';
--- for GPDB 7
-SET default_table_access_method='heap';
-ERROR:  unrecognized configuration parameter "default_table_access_method"
 CREATE EXTENSION diskquota;
 SELECT diskquota.init_table_size_table();
  init_table_size_table 

diff --git a/tests/regress/expected7/test_create_extension.out b/tests/regress/expected7/test_create_extension.out
diff --git a/tests/regress/sql/test_create_extension.sql b/tests/regress/sql/test_create_extension.sql
@@ -1,17 +1,30 @@
 -- check that diskquota ignores global flag appendonly=true
 
--- for GPDB 6
-SET gp_default_storage_options='appendonly=true';
--- for GPDB 7
-SET default_table_access_method='ao_row';
+-- start_matchsubs
+-- m/CREATE EXTENSION$/
+-- s/CREATE EXTENSION$/CREATE/
+-- m/DROP EXTENSION$/
+-- s/DROP EXTENSION$/DROP/
+-- end_matchsubs
+
+-- start_ignore
+SELECT CASE
+    WHEN current_setting('server_version_num')::int > 120000
+    THEN set_config('default_table_access_method', 'ao_row', false)
+    ELSE set_config('gp_default_storage_options', 'appendonly=true', false)
+END;
+-- end_ignore
 
 CREATE EXTENSION diskquota;
 DROP EXTENSION diskquota;
 
--- for GPDB 6
-SET gp_default_storage_options='appendonly=false';
--- for GPDB 7
-SET default_table_access_method='heap';
+-- start_ignore
+SELECT CASE
+    WHEN current_setting('server_version_num')::int > 120000
+    THEN set_config('default_table_access_method', 'heap', false)
+    ELSE set_config('gp_default_storage_options', 'appendonly=false', false)
+END;
+-- end_ignore
 
 CREATE EXTENSION diskquota;