From e079e65da0a7fae66b932753939e84763750fa77 Mon Sep 17 00:00:00 2001
From: Diego Fronza <diego.fronza@percona.com>
Date: Mon, 3 Jan 2022 11:01:01 -0300
Subject: [PATCH] PG-299: Fix conflicts between devel and master.

Updated sql files (pg_stat_monitor_settings view).

Using right variable name and level checking on pgss_store:
key.toplevel = ((exec_nested_level + plan_nested_level) == 0);
---
 pg_stat_monitor--1.0.13.sql.in | 8 +++++---
 pg_stat_monitor--1.0.14.sql.in | 8 +++++---
 pg_stat_monitor.c              | 2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pg_stat_monitor--1.0.13.sql.in b/pg_stat_monitor--1.0.13.sql.in
index 990e62b..662e9a6 100644
--- a/pg_stat_monitor--1.0.13.sql.in
+++ b/pg_stat_monitor--1.0.13.sql.in
@@ -119,12 +119,13 @@ LANGUAGE SQL PARALLEL SAFE;
 
 CREATE FUNCTION pg_stat_monitor_settings(
     OUT name  text,
-    OUT value INTEGER,
-    OUT default_value INTEGER,
+    OUT value text,
+    OUT default_value text,
     OUT description  text,
     OUT minimum INTEGER,
     OUT maximum INTEGER,
-    OUT restart INTEGER
+    OUT options text,
+    OUT restart text
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@@ -137,6 +138,7 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
     description,
     minimum,
     maximum,
+    options,
     restart
 FROM pg_stat_monitor_settings();
 
diff --git a/pg_stat_monitor--1.0.14.sql.in b/pg_stat_monitor--1.0.14.sql.in
index dae64b8..f9cc22f 100644
--- a/pg_stat_monitor--1.0.14.sql.in
+++ b/pg_stat_monitor--1.0.14.sql.in
@@ -119,12 +119,13 @@ LANGUAGE SQL PARALLEL SAFE;
 
 CREATE FUNCTION pg_stat_monitor_settings(
     OUT name  text,
-    OUT value INTEGER,
-    OUT default_value INTEGER,
+    OUT value text,
+    OUT default_value text,
     OUT description  text,
     OUT minimum INTEGER,
     OUT maximum INTEGER,
-    OUT restart INTEGER
+    OUT options text,
+    OUT restart text
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'pg_stat_monitor_settings'
@@ -137,6 +138,7 @@ CREATE VIEW pg_stat_monitor_settings AS SELECT
     description,
     minimum,
     maximum,
+    options,
     restart
 FROM pg_stat_monitor_settings();
 
diff --git a/pg_stat_monitor.c b/pg_stat_monitor.c
index 42286a4..0ea38bc 100644
--- a/pg_stat_monitor.c
+++ b/pg_stat_monitor.c
@@ -1501,7 +1501,7 @@ pgss_store(uint64 queryid,
 #if PG_VERSION_NUM < 140000
     key.toplevel = 1;
 #else
-    key.toplevel = (nested_level == 0);
+    key.toplevel = ((exec_nested_level + plan_nested_level) == 0);
 #endif
 	pgss_hash = pgsm_get_hash();