From fe83f56ab7634c00019ab5117da5412fc258abf3 Mon Sep 17 00:00:00 2001
From: Naeem Akhter <40981522+Naeem-Akhter@users.noreply.github.com>
Date: Wed, 23 Nov 2022 02:20:43 +0500
Subject: [PATCH] PG-554: Remove redundant files and fix regression. (#319)

PG-554: Remove reduntant files and fix regression.

Removed old files with same name and add these files to fix sql regression
on PG 14 & 15.

1- regression/expected/error_1.out
2- regression/expected/error_insert_1.out
3- regression/expected/top_query_1.out
---
 regression/expected/error_1.out        |  6 +++++-
 regression/expected/error_insert_1.out |  3 ++-
 regression/expected/top_query_1.out    | 23 +++++++++++++++++------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/regression/expected/error_1.out b/regression/expected/error_1.out
index 389f7b6..3d74fd0 100644
--- a/regression/expected/error_1.out
+++ b/regression/expected/error_1.out
@@ -27,11 +27,15 @@ SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLA
  SELECT * FROM unknown;           |     21 | 42P01   | relation "unknown" does not exist
  SELECT 1/0;                      |     21 | 22012   | division by zero
  SELECT pg_stat_monitor_reset()   |      0 |         | 
+ do $$                           +|      0 |         | 
+ BEGIN                           +|        |         | 
+ RAISE WARNING 'warning message';+|        |         | 
+ END $$                           |        |         | 
  do $$                           +|     19 | 01000   | warning message
  BEGIN                           +|        |         | 
  RAISE WARNING 'warning message';+|        |         | 
  END $$;                          |        |         | 
-(5 rows)
+(6 rows)
 
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 
diff --git a/regression/expected/error_insert_1.out b/regression/expected/error_insert_1.out
index fc8cba7..e201a36 100644
--- a/regression/expected/error_insert_1.out
+++ b/regression/expected/error_insert_1.out
@@ -19,10 +19,11 @@ Drop Table if exists Company;
 SELECT query, elevel, sqlcode, message FROM pg_stat_monitor ORDER BY query COLLATE "C",elevel;
                          query                         | elevel | sqlcode |                            message                            
 -------------------------------------------------------+--------+---------+---------------------------------------------------------------
+ Drop Table if exists Company                          |      0 |         | 
  INSERT  INTO Company(ID, Name) VALUES (1, 'Percona')  |      0 |         | 
  INSERT  INTO Company(ID, Name) VALUES (1, 'Percona'); |     21 | 23505   | duplicate key value violates unique constraint "company_pkey"
  SELECT pg_stat_monitor_reset()                        |      0 |         | 
-(3 rows)
+(4 rows)
 
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset 
diff --git a/regression/expected/top_query_1.out b/regression/expected/top_query_1.out
index eb09470..9109771 100644
--- a/regression/expected/top_query_1.out
+++ b/regression/expected/top_query_1.out
@@ -24,12 +24,23 @@ SELECT add2(1,2);
 (1 row)
 
 SELECT query, top_query FROM pg_stat_monitor ORDER BY query COLLATE "C";
-             query              |    top_query     
---------------------------------+------------------
- (select $1 + $2)               | SELECT add2(1,2)
- SELECT add2(1,2)               | 
- SELECT pg_stat_monitor_reset() | 
-(3 rows)
+                            query                            |    top_query     
+-------------------------------------------------------------+------------------
+ (select $1 + $2)                                            | SELECT add2(1,2)
+ CREATE OR REPLACE FUNCTION add(int, int) RETURNS INTEGER AS+| 
+ $$                                                         +| 
+ BEGIN                                                      +| 
+         return (select $1 + $2);                           +| 
+ END; $$ language plpgsql                                    | 
+ CREATE OR REPLACE function add2(int, int) RETURNS int as   +| 
+ $$                                                         +| 
+ BEGIN                                                      +| 
+         return add($1,$2);                                 +| 
+ END;                                                       +| 
+ $$ language plpgsql                                         | 
+ SELECT add2(1,2)                                            | 
+ SELECT pg_stat_monitor_reset()                              | 
+(5 rows)
 
 SELECT pg_stat_monitor_reset();
  pg_stat_monitor_reset