Skip to content

Commit

Permalink
Post merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
artemgavrilov committed May 17, 2024
1 parent 41222b5 commit 57e98cd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion expected/basic_1.out
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WHERE name LIKE 'percona_pg_telemetry.%';
name
------------------------------
percona_pg_telemetry.enabled
percona_telemetry.path
percona_pg_telemetry.path
(2 rows)

SELECT percona_pg_telemetry_version();
Expand Down
4 changes: 2 additions & 2 deletions expected/debug_json.out
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ HAVING COUNT(*) = (
)
AS INTEGER
)
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_telemetry.path') AS INTEGER)
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_pg_telemetry.path') AS INTEGER)
);
databases_count
-----------------
Expand All @@ -76,7 +76,7 @@ FROM pg_database
WHERE datallowconn = true
HAVING COUNT(*) = (
SELECT json_array_length(read_json_file()::JSON->'databases')
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_telemetry.path') AS INTEGER)
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_pg_telemetry.path') AS INTEGER)
);
databases_count_calc
----------------------
Expand Down
2 changes: 1 addition & 1 deletion expected/gucs_1.out
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ max_val |
boot_val | on
reset_val | on
-[ RECORD 2 ]-------------------------------------------------
name | percona_telemetry.path
name | percona_pg_telemetry.path
setting | /usr/local/percona/telemetry/pg
unit |
short_desc | Directory path for writing database info file(s)
Expand Down
4 changes: 2 additions & 2 deletions sql/debug_json.sql
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ HAVING COUNT(*) = (
)
AS INTEGER
)
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_telemetry.path') AS INTEGER)
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_pg_telemetry.path') AS INTEGER)
);
-- Databases count will fail if you have any preexisting databases other than the standard template1 and postgres

Expand All @@ -59,7 +59,7 @@ FROM pg_database
WHERE datallowconn = true
HAVING COUNT(*) = (
SELECT json_array_length(read_json_file()::JSON->'databases')
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_telemetry.path') AS INTEGER)
+ CAST(NOT EXISTS (SELECT * FROM pg_settings where name = 'percona_pg_telemetry.path') AS INTEGER)
);
-- Databases count will fail if you have any preexisting databases other than the standard template1 and postgres

Expand Down

0 comments on commit 57e98cd

Please sign in to comment.