Merge pull request #105 from timescale/fix_update_script

Fix search path in update script

Author: sumerman

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "promscale_rs"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2018"
 
 [lib]

Cargo.toml

@@ -28,17 +28,17 @@ docker-image-ts1: docker-image-build-1
 
 docker-image-ts2-12: PG_VER=pg12
 docker-image-ts2-12: TIMESCALEDB_MAJOR=2
-docker-image-ts2-12: TIMESCALEDB_VER=2.5.2
+docker-image-ts2-12: TIMESCALEDB_VER=2.6.0
 docker-image-ts2-12: docker-image-build-2-12
 
 docker-image-ts2-13: PG_VER=pg13
 docker-image-ts2-13: TIMESCALEDB_MAJOR=2
-docker-image-ts2-13: TIMESCALEDB_VER=2.5.2
+docker-image-ts2-13: TIMESCALEDB_VER=2.6.0
 docker-image-ts2-13: docker-image-build-2-13
 
 docker-image-ts2-14: PG_VER=pg14
 docker-image-ts2-14: TIMESCALEDB_MAJOR=2
-docker-image-ts2-14: TIMESCALEDB_VER=2.5.2
+docker-image-ts2-14: TIMESCALEDB_VER=2.6.0
 docker-image-ts2-14: docker-image-build-2-14
 
 docker-image: docker-image-ts2-14 docker-image-ts2-13 docker-image-ts2-12 docker-image-ts1

DockerMakefile

@@ -1,5 +1,5 @@
 # promscale extension
 comment = 'Promscale support functions'
-default_version = '0.3.1'
+default_version = '0.3.2'
 module_pathname = '$libdir/promscale'
 relocatable = false

promscale.control

@@ -40,11 +40,11 @@ CREATE AGGREGATE @[email protected]_selector(
     sample_time timestamptz,
     sample_value DOUBLE PRECISION)
 (
-    sfunc = vector_selector_transition,
+    sfunc = @extschema@.vector_selector_transition,
     stype = internal,
-    finalfunc = vector_selector_final,
-    combinefunc = vector_selector_combine,
-    serialfunc = vector_selector_serialize,
-    deserialfunc = vector_selector_deserialize,
+    finalfunc = @extschema@.vector_selector_final,
+    combinefunc = @extschema@.vector_selector_combine,
+    serialfunc = @extschema@.vector_selector_serialize,
+    deserialfunc = @extschema@.vector_selector_deserialize,
     parallel = safe
 );

sql/promscale--0.1.2--0.1.3-beta.sql

@@ -250,11 +250,11 @@ CREATE AGGREGATE @[email protected]_selector(
     sample_time timestamptz,
     sample_value DOUBLE PRECISION)
 (
-    sfunc = vector_selector_transition,
+    sfunc = @extschema@.vector_selector_transition,
     stype = internal,
-    finalfunc = vector_selector_final,
-    combinefunc = vector_selector_combine,
-    serialfunc = vector_selector_serialize,
-    deserialfunc = vector_selector_deserialize,
+    finalfunc = @extschema@.vector_selector_final,
+    combinefunc = @extschema@.vector_selector_combine,
+    serialfunc = @extschema@.vector_selector_serialize,
+    deserialfunc = @extschema@.vector_selector_deserialize,
     parallel = safe
 );

sql/promscale--0.1.3-beta.sql

@@ -0,0 +1,54 @@
+CREATE OR REPLACE FUNCTION @[email protected]_find_key_equal(key_to_match prom_api.label_key, pat prom_api.pattern)
+RETURNS prom_api.matcher_positive
+AS $func$
+    SELECT COALESCE(pg_catalog.array_agg(l.id), array[]::int[])::prom_api.matcher_positive
+    FROM _prom_catalog.label l
+    WHERE l.key OPERATOR(pg_catalog.=) key_to_match and l.value OPERATOR(pg_catalog.=) pat
+$func$
+LANGUAGE SQL STABLE PARALLEL SAFE
+SUPPORT @[email protected]_call_subquery_support;
+ALTER FUNCTION @[email protected]_find_key_equal(prom_api.label_key, prom_api.pattern) OWNER TO CURRENT_USER;
+
+CREATE  OR REPLACE FUNCTION @[email protected]_find_key_not_equal(key_to_match prom_api.label_key, pat prom_api.pattern)
+RETURNS prom_api.matcher_negative
+AS $func$
+    SELECT COALESCE(pg_catalog.array_agg(l.id), array[]::int[])::prom_api.matcher_negative
+    FROM _prom_catalog.label l
+    WHERE l.key OPERATOR(pg_catalog.=) key_to_match and l.value OPERATOR(pg_catalog.=) pat
+$func$
+LANGUAGE SQL STABLE PARALLEL SAFE
+SUPPORT @[email protected]_call_subquery_support;
+ALTER FUNCTION @[email protected]_find_key_not_equal(prom_api.label_key, prom_api.pattern) OWNER TO CURRENT_USER;
+
+CREATE OR REPLACE FUNCTION @[email protected]_find_key_regex(key_to_match prom_api.label_key, pat prom_api.pattern)
+RETURNS prom_api.matcher_positive
+AS $func$
+    SELECT COALESCE(pg_catalog.array_agg(l.id), array[]::int[])::prom_api.matcher_positive
+    FROM _prom_catalog.label l
+    WHERE l.key OPERATOR(pg_catalog.=) key_to_match and l.value OPERATOR(pg_catalog.~) pat
+$func$
+LANGUAGE SQL STABLE PARALLEL SAFE
+SUPPORT @[email protected]_call_subquery_support;
+ALTER FUNCTION @[email protected]_find_key_regex(prom_api.label_key, prom_api.pattern) OWNER TO CURRENT_USER;
+
+CREATE OR REPLACE FUNCTION @[email protected]_find_key_not_regex(key_to_match prom_api.label_key, pat prom_api.pattern)
+RETURNS prom_api.matcher_negative
+AS $func$
+    SELECT COALESCE(pg_catalog.array_agg(l.id), array[]::int[])::prom_api.matcher_negative
+    FROM _prom_catalog.label l
+    WHERE l.key OPERATOR(pg_catalog.=) key_to_match and l.value OPERATOR(pg_catalog.~) pat
+$func$
+LANGUAGE SQL STABLE PARALLEL SAFE
+SUPPORT @[email protected]_call_subquery_support;
+ALTER FUNCTION @[email protected]_find_key_not_regex(prom_api.label_key, prom_api.pattern) OWNER TO CURRENT_USER;
+
+CREATE OR REPLACE FUNCTION @[email protected]_tsprom_metadata(meta_key text, meta_value text, send_telemetry BOOLEAN)
+RETURNS VOID
+SET search_path TO pg_catalog
+AS $func$
+    INSERT INTO _timescaledb_catalog.metadata(key, value, include_in_telemetry)
+    VALUES ('promscale_' OPERATOR(pg_catalog.||) meta_key,meta_value, send_telemetry)
+    ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value, include_in_telemetry = EXCLUDED.include_in_telemetry
+$func$
+LANGUAGE SQL VOLATILE SECURITY DEFINER;
+ALTER FUNCTION @[email protected]_tsprom_metadata(text, text, BOOLEAN) OWNER TO CURRENT_USER;

sql/promscale--0.3.1--0.3.2.sql

@@ -0,0 +1 @@
+promscale--0.3.1.sql