Fix mutliple problems with regression tests.

rjuju · rjuju · commit f4410afca028 · 2020-01-09T16:23:05.000+01:00
- the ^@ operator does not exist in all supported version, so use instead the
  "text ~ text" non-commutable operator
- first tests could fail is used against an instance with preexisting data in
  pg_qualstats' shmem
- a test would give different results whether pg_stat_statements is installed
  or not
diff --git a/expected/pg_qualstats.out b/expected/pg_qualstats.out
@@ -1,4 +1,11 @@
 CREATE EXTENSION pg_qualstats;
+-- Make sure that installcheck won't find previous data
+SELECT pg_qualstats_reset();
+ pg_qualstats_reset 
+--------------------
+ 
+(1 row)
+
 -- Make sure sure we'll see at least one qual
 SET pg_qualstats.sample_rate = 1;
 CREATE TABLE pgqs AS SELECT id, 'a'::text val FROM generate_series(1, 100) id;
@@ -60,7 +67,7 @@ SELECT COUNT(*) FROM pg_qualstats();
 (1 row)
 
 -- const non_commutable_operator var, should be tracked, var found on RHS
-SELECT * FROM pgqs WHERE 'somevalue' ^@ val;
+SELECT * FROM pgqs WHERE 'meh' ~ val;
  id | val 
 ----+-----
 (0 rows)
@@ -105,12 +112,13 @@ SELECT * FROM pgqs WHERE 0 = id;
 ----+-----
 (0 rows)
 
-SELECT lrelid::regclass, lattnum, rrelid::regclass, rattnum FROM pg_qualstats();
- lrelid | lattnum | rrelid | rattnum 
---------+---------+--------+---------
- pgqs   |       1 |        |        
- pgqs   |       1 |        |        
-(2 rows)
+SELECT lrelid::regclass, lattnum, rrelid::regclass, rattnum, sum(occurences)
+FROM pg_qualstats()
+GROUP by 1, 2, 3, 4;
+ lrelid | lattnum | rrelid | rattnum | sum 
+--------+---------+--------+---------+-----
+ pgqs   |       1 |        |         |   2
+(1 row)
 
 SELECT COUNT(DISTINCT qualnodeid) FROM pg_qualstats();
  count 
diff --git a/test/sql/pg_qualstats.sql b/test/sql/pg_qualstats.sql
@@ -1,5 +1,8 @@
 CREATE EXTENSION pg_qualstats;
 
+-- Make sure that installcheck won't find previous data
+SELECT pg_qualstats_reset();
+
 -- Make sure sure we'll see at least one qual
 SET pg_qualstats.sample_rate = 1;
 
@@ -18,7 +21,7 @@ SELECT COUNT(*) FROM pg_qualstats();
 SELECT * FROM (SELECT * FROM pgqs LIMIT 0) pgqs WHERE pgqs.id = 0;
 SELECT COUNT(*) FROM pg_qualstats();
 -- const non_commutable_operator var, should be tracked, var found on RHS
-SELECT * FROM pgqs WHERE 'somevalue' ^@ val;
+SELECT * FROM pgqs WHERE 'meh' ~ val;
 SELECT lrelid::regclass, lattnum, rrelid::regclass, rattnum FROM pg_qualstats();
 SELECT pg_qualstats_reset();
 -- opexpr operator var and commuted, shouldn't be tracked
@@ -28,7 +31,9 @@ SELECT COUNT(*) FROM pg_qualstats();
 -- same query with handled commuted qual, which should be found as identical
 SELECT * FROM pgqs WHERE id = 0;
 SELECT * FROM pgqs WHERE 0 = id;
-SELECT lrelid::regclass, lattnum, rrelid::regclass, rattnum FROM pg_qualstats();
+SELECT lrelid::regclass, lattnum, rrelid::regclass, rattnum, sum(occurences)
+FROM pg_qualstats()
+GROUP by 1, 2, 3, 4;
 SELECT COUNT(DISTINCT qualnodeid) FROM pg_qualstats();
 -- (unique)qualid behavior
 SELECT pg_qualstats_reset();
