remove old functions for good

Author: Medvecrab

pg_wait_sampling--1.1--1.2.sql

@@ -3,28 +3,28 @@
 -- complain if script is sourced in psql, rather than via ALTER EXTENSION
 \echo Use "ALTER EXTENSION pg_wait_sampling UPDATE TO 1.2" to load this file. \quit
 
---DROP FUNCTION pg_wait_sampling_get_current (
---	pid int4,
---	OUT pid int4,
---	OUT event_type text,
---	OUT event text
---) CASCADE;
---
---DROP FUNCTION pg_wait_sampling_get_history (
---	OUT pid int4,
---	OUT ts timestamptz,
---	OUT event_type text,
---	OUT event text
---) CASCADE;
---
---DROP FUNCTION pg_wait_sampling_get_profile (
---	OUT pid int4,
---	OUT event_type text,
---	OUT event text,
---	OUT count bigint
---) CASCADE;
+DROP FUNCTION pg_wait_sampling_get_current (
+	pid int4,
+	OUT pid int4,
+	OUT event_type text,
+	OUT event text
+) CASCADE;
+
+DROP FUNCTION pg_wait_sampling_get_history (
+	OUT pid int4,
+	OUT ts timestamptz,
+	OUT event_type text,
+	OUT event text
+) CASCADE;
 
-CREATE FUNCTION pg_wait_sampling_get_current_extended (
+DROP FUNCTION pg_wait_sampling_get_profile (
+	OUT pid int4,
+	OUT event_type text,
+	OUT event text,
+	OUT count bigint
+) CASCADE;
+
+CREATE FUNCTION pg_wait_sampling_get_current (
 	pid int4,
 	OUT pid int4,
 	OUT event_type text,
@@ -45,12 +45,12 @@ RETURNS SETOF record
 AS 'MODULE_PATHNAME'
 LANGUAGE C VOLATILE CALLED ON NULL INPUT;
 
-CREATE VIEW pg_wait_sampling_current_extended AS
-	SELECT * FROM pg_wait_sampling_get_current_extended(NULL::integer);
+CREATE VIEW pg_wait_sampling_current AS
+	SELECT * FROM pg_wait_sampling_get_current(NULL::integer);
 
 GRANT SELECT ON pg_wait_sampling_current TO PUBLIC;
 
-CREATE FUNCTION pg_wait_sampling_get_history_extended (
+CREATE FUNCTION pg_wait_sampling_get_history (
 	OUT pid int4,
 	OUT event_type text,
 	OUT event text,
@@ -71,12 +71,12 @@ RETURNS SETOF record
 AS 'MODULE_PATHNAME'
 LANGUAGE C VOLATILE STRICT;
 
-CREATE VIEW pg_wait_sampling_history_extended AS
-	SELECT * FROM pg_wait_sampling_get_history_extended();
+CREATE VIEW pg_wait_sampling_history AS
+	SELECT * FROM pg_wait_sampling_get_history();
 
-GRANT SELECT ON pg_wait_sampling_history_extended TO PUBLIC;
+GRANT SELECT ON pg_wait_sampling_history TO PUBLIC;
 
-CREATE FUNCTION pg_wait_sampling_get_profile_extended (
+CREATE FUNCTION pg_wait_sampling_get_profile (
 	OUT pid int4,
 	OUT event_type text,
 	OUT event text,
@@ -97,10 +97,10 @@ RETURNS SETOF record
 AS 'MODULE_PATHNAME'
 LANGUAGE C VOLATILE STRICT;
 
-CREATE VIEW pg_wait_sampling_profile_extended AS
-	SELECT * FROM pg_wait_sampling_get_profile_extended();
+CREATE VIEW pg_wait_sampling_profile AS
+	SELECT * FROM pg_wait_sampling_get_profile();
 
-GRANT SELECT ON pg_wait_sampling_profile_extended TO PUBLIC;
+GRANT SELECT ON pg_wait_sampling_profile TO PUBLIC;
 
 CREATE FUNCTION pg_wait_sampling_reset_history()
 RETURNS void
@@ -109,10 +109,3 @@ LANGUAGE C VOLATILE STRICT;
 
 -- Don't want this to be available to non-superusers.
 REVOKE ALL ON FUNCTION pg_wait_sampling_reset_history() FROM PUBLIC;
-
---CREATE VIEW pg_wait_sampling_profile AS
---	SELECT pid, event_type, event, queryid, SUM(count) FROM pg_wait_sampling_profile_extended
---	GROUP BY pid, event_type, event, queryid;
---
---GRANT SELECT ON pg_wait_sampling_profile TO PUBLIC;
-