From ebda3eff612b1e95a1045934bc1eb56c2e6b3b50 Mon Sep 17 00:00:00 2001
From: SaitTalhaNisanci <s.talhanisanci@gmail.com>
Date: Thu, 9 Apr 2020 13:11:13 +0300
Subject: [PATCH] read database name inside the function (#3730)

---
 src/test/regress/expected/multi_extension.out | 6 +++---
 src/test/regress/sql/multi_extension.sql      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out
index 9af8a7df0..6a0beba23 100644
--- a/src/test/regress/expected/multi_extension.out
+++ b/src/test/regress/expected/multi_extension.out
@@ -7,7 +7,7 @@
 -- not done yet.
 SET citus.next_shard_id TO 580000;
 SELECT $definition$
-CREATE OR REPLACE FUNCTION test.maintenance_worker(p_dbname text DEFAULT current_database())
+CREATE OR REPLACE FUNCTION test.maintenance_worker()
     RETURNS pg_stat_activity
     LANGUAGE plpgsql
 AS $$
@@ -19,7 +19,7 @@ BEGIN
     FOR i IN 1 .. 200 LOOP
         PERFORM pg_stat_clear_snapshot();
         SELECT * INTO activity FROM pg_stat_activity
-        WHERE application_name = 'Citus Maintenance Daemon' AND datname = p_dbname;
+        WHERE application_name = 'Citus Maintenance Daemon' AND datname = current_database();
         IF activity.pid IS NOT NULL THEN
             RETURN activity;
         ELSE
@@ -127,7 +127,7 @@ ALTER EXTENSION citus UPDATE TO '9.2-4';
  * but we do not support explicitly updating it to to 9.3-1.
  * Hence below update (to 9.3-1) command should fail.
  */
- ALTER EXTENSION citus UPDATE TO '9.3-1';
+ALTER EXTENSION citus UPDATE TO '9.3-1';
 ERROR:  extension "citus" has no update path from version "9.2-4" to version "9.3-1"
 ALTER EXTENSION citus UPDATE TO '9.3-2';
 -- show running version
diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql
index 5071f378f..3b64c6aa2 100644
--- a/src/test/regress/sql/multi_extension.sql
+++ b/src/test/regress/sql/multi_extension.sql
@@ -10,7 +10,7 @@
 SET citus.next_shard_id TO 580000;
 
 SELECT $definition$
-CREATE OR REPLACE FUNCTION test.maintenance_worker(p_dbname text DEFAULT current_database())
+CREATE OR REPLACE FUNCTION test.maintenance_worker()
     RETURNS pg_stat_activity
     LANGUAGE plpgsql
 AS $$
@@ -22,7 +22,7 @@ BEGIN
     FOR i IN 1 .. 200 LOOP
         PERFORM pg_stat_clear_snapshot();
         SELECT * INTO activity FROM pg_stat_activity
-        WHERE application_name = 'Citus Maintenance Daemon' AND datname = p_dbname;
+        WHERE application_name = 'Citus Maintenance Daemon' AND datname = current_database();
         IF activity.pid IS NOT NULL THEN
             RETURN activity;
         ELSE