mirrors/postgsail
1
0
Fork 0
mirror of https://github.com/xbgmsharp/postgsail.git synced 2025-09-17 11:17:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more English typo

Browse Source
This commit is contained in:
xbgmsharp
2023-07-21 17:01:05 +02:00
parent 8ce04ec282
commit 3aa26685eb
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
initdb/02_2_signalk_cron.sql
View File

@@ -330,12 +330,12 @@ COMMENT ON FUNCTION
IS 'init by pg_cron to check for new event pending notifications, if so perform process_notification_queue_fn'; IS 'init by pg_cron to check for new event pending notifications, if so perform process_notification_queue_fn';
-- CRON for Vacuum database -- CRON for Vacuum database
CREATE FUNCTION cron_vaccum_fn() RETURNS void AS $$ CREATE FUNCTION cron_vacuum_fn() RETURNS void AS $$
-- ERROR: VACUUM cannot be executed from a function -- ERROR: VACUUM cannot be executed from a function
declare declare
begin begin
-- Vacuum -- Vacuum
RAISE NOTICE 'cron_vaccum_fn'; RAISE NOTICE 'cron_vacuum_fn';
VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.logbook; VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.logbook;
VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.stays; VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.stays;
VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.moorages; VACUUM (FULL, VERBOSE, ANALYZE, INDEX_CLEANUP) api.moorages;
@@ -345,10 +345,10 @@ END;
$$ language plpgsql; $$ language plpgsql;
-- Description -- Description
COMMENT ON FUNCTION COMMENT ON FUNCTION
public.cron_vaccum_fn public.cron_vacuum_fn
IS 'init by pg_cron to full vaccum tables on schema api'; IS 'init by pg_cron to full vacuum tables on schema api';
-- CRON for Vacuum database -- CRON for clean up job details logs
CREATE FUNCTION job_run_details_cleanup_fn() RETURNS void AS $$ CREATE FUNCTION job_run_details_cleanup_fn() RETURNS void AS $$
DECLARE DECLARE
BEGIN BEGIN
@@ -360,8 +360,8 @@ END;
$$ language plpgsql; $$ language plpgsql;
-- Description -- Description
COMMENT ON FUNCTION COMMENT ON FUNCTION
public.cron_vaccum_fn public.job_run_details_cleanup_fn
IS 'init by pg_cron to cleanup job_run_details table on schema public postgras db'; IS 'init by pg_cron to cleanup job_run_details table on schema public postgres db';
-- CRON for alerts notification -- CRON for alerts notification
CREATE FUNCTION cron_process_alerts_fn() RETURNS void AS $$ CREATE FUNCTION cron_process_alerts_fn() RETURNS void AS $$

36
initdb/02_3_2_signalk_public_functions.sql
View File

@@ -197,7 +197,7 @@ CREATE OR REPLACE FUNCTION process_logbook_queue_fn(IN _id integer) RETURNS void
RAISE WARNING '-> process_logbook_queue_fn invalid input %', _id; RAISE WARNING '-> process_logbook_queue_fn invalid input %', _id;
RETURN; RETURN;
END IF; END IF;
-- Get the logbook record with all necesary fields exist -- Get the logbook record with all necessary fields exist
SELECT * INTO logbook_rec SELECT * INTO logbook_rec
FROM api.logbook FROM api.logbook
WHERE active IS false WHERE active IS false
@@ -338,7 +338,7 @@ CREATE OR REPLACE FUNCTION process_stay_queue_fn(IN _id integer) RETURNS void AS
RAISE WARNING '-> process_stay_queue_fn invalid input %', _id; RAISE WARNING '-> process_stay_queue_fn invalid input %', _id;
RETURN; RETURN;
END IF; END IF;
-- Get the stay record with all necesary fields exist -- Get the stay record with all necessary fields exist
SELECT * INTO stay_rec SELECT * INTO stay_rec
FROM api.stays FROM api.stays
WHERE id = _id WHERE id = _id
@@ -385,7 +385,7 @@ CREATE OR REPLACE FUNCTION process_moorage_queue_fn(IN _id integer) RETURNS void
RAISE WARNING '-> process_moorage_queue_fn invalid input %', _id; RAISE WARNING '-> process_moorage_queue_fn invalid input %', _id;
RETURN; RETURN;
END IF; END IF;
-- Get the stay record with all necesary fields exist -- Get the stay record with all necessary fields exist
SELECT * INTO stay_rec SELECT * INTO stay_rec
FROM api.stays FROM api.stays
WHERE active IS false WHERE active IS false
@@ -479,7 +479,7 @@ CREATE OR REPLACE FUNCTION process_account_queue_fn(IN _email TEXT) RETURNS void
BEGIN BEGIN
IF _email IS NULL OR _email = '' THEN IF _email IS NULL OR _email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
SELECT * INTO account_rec SELECT * INTO account_rec
@@ -487,7 +487,7 @@ CREATE OR REPLACE FUNCTION process_account_queue_fn(IN _email TEXT) RETURNS void
WHERE email = _email; WHERE email = _email;
IF account_rec.email IS NULL OR account_rec.email = '' THEN IF account_rec.email IS NULL OR account_rec.email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
-- Gather email and pushover app settings -- Gather email and pushover app settings
@@ -518,7 +518,7 @@ CREATE OR REPLACE FUNCTION process_account_otp_validation_queue_fn(IN _email TEX
BEGIN BEGIN
IF _email IS NULL OR _email = '' THEN IF _email IS NULL OR _email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
SELECT * INTO account_rec SELECT * INTO account_rec
@@ -526,7 +526,7 @@ CREATE OR REPLACE FUNCTION process_account_otp_validation_queue_fn(IN _email TEX
WHERE email = _email; WHERE email = _email;
IF account_rec.email IS NULL OR account_rec.email = '' THEN IF account_rec.email IS NULL OR account_rec.email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
-- Gather email and pushover app settings -- Gather email and pushover app settings
@@ -559,7 +559,7 @@ AS $process_notification_queue$
BEGIN BEGIN
IF _email IS NULL OR _email = '' THEN IF _email IS NULL OR _email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
SELECT * INTO account_rec SELECT * INTO account_rec
@@ -567,7 +567,7 @@ AS $process_notification_queue$
WHERE email = _email; WHERE email = _email;
IF account_rec.email IS NULL OR account_rec.email = '' THEN IF account_rec.email IS NULL OR account_rec.email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
@@ -584,7 +584,7 @@ AS $process_notification_queue$
WHERE owner_email = _email; WHERE owner_email = _email;
IF vessel_rec.owner_email IS NULL OR vessel_rec.owner_email = '' THEN IF vessel_rec.owner_email IS NULL OR vessel_rec.owner_email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
user_settings := '{"email": "' || vessel_rec.owner_email || '", "boat": "' || vessel_rec.name || '"}'; user_settings := '{"email": "' || vessel_rec.owner_email || '", "boat": "' || vessel_rec.name || '"}';
@@ -610,7 +610,7 @@ CREATE OR REPLACE FUNCTION process_vessel_queue_fn(IN _email TEXT) RETURNS void
BEGIN BEGIN
IF _email IS NULL OR _email = '' THEN IF _email IS NULL OR _email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
SELECT * INTO vessel_rec SELECT * INTO vessel_rec
@@ -618,7 +618,7 @@ CREATE OR REPLACE FUNCTION process_vessel_queue_fn(IN _email TEXT) RETURNS void
WHERE owner_email = _email; WHERE owner_email = _email;
IF vessel_rec.owner_email IS NULL OR vessel_rec.owner_email = '' THEN IF vessel_rec.owner_email IS NULL OR vessel_rec.owner_email = '' THEN
RAISE EXCEPTION 'Invalid email' RAISE EXCEPTION 'Invalid email'
USING HINT = 'Unknow email'; USING HINT = 'Unknown email';
RETURN; RETURN;
END IF; END IF;
-- Gather email and pushover app settings -- Gather email and pushover app settings
@@ -1026,7 +1026,7 @@ CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id integer) RETURNS
badge_tmp text; badge_tmp text;
begin begin
RAISE WARNING '--> user.email [%], vessel.id [%]', current_setting('user.email', false), current_setting('vessel.id', false); RAISE WARNING '--> user.email [%], vessel.id [%]', current_setting('user.email', false), current_setting('vessel.id', false);
-- Tropical & Alaska zone manualy add into ne_10m_geography_marine_polys -- Tropical & Alaska zone manually add into ne_10m_geography_marine_polys
-- Check if each geographic marine zone exist as a badge -- Check if each geographic marine zone exist as a badge
FOR marine_rec IN FOR marine_rec IN
WITH log AS ( WITH log AS (
@@ -1039,7 +1039,7 @@ CREATE OR REPLACE FUNCTION public.badges_geom_fn(IN logbook_id integer) RETURNS
log.track_geom log.track_geom
) )
LOOP LOOP
-- If not generate and insert the new bagde -- If not generate and insert the new badge
--RAISE WARNING 'geography_marine [%]', marine_rec.name; --RAISE WARNING 'geography_marine [%]', marine_rec.name;
SELECT jsonb_extract_path(a.preferences, 'badges', marine_rec.name) IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false); SELECT jsonb_extract_path(a.preferences, 'badges', marine_rec.name) IS NOT NULL INTO _exist FROM auth.accounts a WHERE a.email = current_setting('user.email', false);
--RAISE WARNING 'geography_marine [%]', _exist; --RAISE WARNING 'geography_marine [%]', _exist;
@@ -1132,13 +1132,13 @@ BEGIN
RAISE sqlstate 'PT551' using RAISE sqlstate 'PT551' using
message = 'Vessel Required', message = 'Vessel Required',
detail = 'Invalid vessel', detail = 'Invalid vessel',
hint = 'Unknow vessel'; hint = 'Unknown vessel';
--RETURN; -- ignore if not exist --RETURN; -- ignore if not exist
END IF; END IF;
-- Redundant? -- Redundant?
IF vessel_rec.vessel_id IS NULL THEN IF vessel_rec.vessel_id IS NULL THEN
RAISE EXCEPTION 'Invalid vessel' RAISE EXCEPTION 'Invalid vessel'
USING HINT = 'Unknow vessel id'; USING HINT = 'Unknown vessel id';
END IF; END IF;
-- Set session variables -- Set session variables
PERFORM set_config('vessel.id', vessel_rec.vessel_id, false); PERFORM set_config('vessel.id', vessel_rec.vessel_id, false);
@@ -1156,7 +1156,7 @@ BEGIN
AND auth.vessels.vessel_id = _vid; AND auth.vessels.vessel_id = _vid;
IF vessel_rec.owner_email IS NULL THEN IF vessel_rec.owner_email IS NULL THEN
RAISE EXCEPTION 'Invalid vessel' RAISE EXCEPTION 'Invalid vessel'
USING HINT = 'Unknow vessel owner_email'; USING HINT = 'Unknown vessel owner_email';
END IF; END IF;
PERFORM set_config('vessel.id', vessel_rec.vessel_id, false); PERFORM set_config('vessel.id', vessel_rec.vessel_id, false);
PERFORM set_config('vessel.name', vessel_rec.name, false); PERFORM set_config('vessel.name', vessel_rec.name, false);
@@ -1171,7 +1171,7 @@ $$ language plpgsql security definer;
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Function to trigger cron_jobs using API for tests. -- Function to trigger cron_jobs using API for tests.
-- Todo limit access and permision -- Todo limit access and permission
-- Run con jobs -- Run con jobs
CREATE OR REPLACE FUNCTION public.run_cron_jobs() RETURNS void AS $$ CREATE OR REPLACE FUNCTION public.run_cron_jobs() RETURNS void AS $$
BEGIN BEGIN