From 2a282a439e49006083e047679b06e136d0b282a4 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Sun, 1 Oct 2023 14:06:43 -0500 Subject: [PATCH] Put julian_to() into it's own file The db commenting build system requires a file per function name. --- db/schemas/sokwedb/functions/Makefile | 2 +- db/schemas/sokwedb/functions/create/julian.m4 | 34 ---------- .../sokwedb/functions/create/julian_to.m4 | 63 +++++++++++++++++++ db/schemas/sokwedb/functions/drop/julian.m4 | 2 - .../sokwedb/functions/drop/julian_to.m4 | 23 +++++++ 5 files changed, 87 insertions(+), 37 deletions(-) create mode 100644 db/schemas/sokwedb/functions/create/julian_to.m4 create mode 100644 db/schemas/sokwedb/functions/drop/julian_to.m4 diff --git a/db/schemas/sokwedb/functions/Makefile b/db/schemas/sokwedb/functions/Makefile index c6c0b9d..c2cb74e 100644 --- a/db/schemas/sokwedb/functions/Makefile +++ b/db/schemas/sokwedb/functions/Makefile @@ -18,7 +18,7 @@ # Karl O. Pinc # This determines the order in which the functions are put into the database. -ORDER := julian +ORDER := julian julian_to ## ## CAUTION: This Makefile is not designed to be run directly. It is normally diff --git a/db/schemas/sokwedb/functions/create/julian.m4 b/db/schemas/sokwedb/functions/create/julian.m4 index 9c080f6..9e425f1 100644 --- a/db/schemas/sokwedb/functions/create/julian.m4 +++ b/db/schemas/sokwedb/functions/create/julian.m4 @@ -82,37 +82,3 @@ changequote(`,')dnl -- Make the functions. _make_julian_func(`DATE', `') _make_julian_func(`TIMESTAMP', `::DATE') - - -CREATE OR REPLACE FUNCTION julian_to(julian_day INT) - RETURNS DATE - LANGUAGE plpgsql - IMMUTABLE - sdb_function_set_search_path - AS $$ - - -- Convert a Julian Day to its corresponding date. - -- - -- AGPL_notice(` --', `2004, 2008', `Karl O. Pinc ') - -- - -- Syntax: julian_to(julian_day) - -- - -- Input: - -- julian_date The date to convert. - -- - -- Returns: - -- The date value for the given Julian Day. - -- - -- Remarks: - -- Really ought to be built-into postgresql. - - DECLARE - day_zero CONSTANT DATE - := CURRENT_DATE - CAST (to_char(CURRENT_DATE, 'J') AS INT); - - BEGIN - RETURN day_zero + julian_day; - END; -$$; - -grant_everybody_func_priv(`julian_to(INT)') diff --git a/db/schemas/sokwedb/functions/create/julian_to.m4 b/db/schemas/sokwedb/functions/create/julian_to.m4 new file mode 100644 index 0000000..931c4cd --- /dev/null +++ b/db/schemas/sokwedb/functions/create/julian_to.m4 @@ -0,0 +1,63 @@ +dnl Copyright (C) 2012, 2023 The Meme Factory, Inc., http://www.karlpinc.com/ +dnl Copyright (C) 2004, 2008, 2010 Karl O. Pinc +dnl +dnl This program is free software: you can redistribute it and/or modify +dnl it under the terms of the GNU Affero General Public License as published +dnl by the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU Affero General Public License for more details. +dnl +dnl You should have received a copy of the GNU Affero General Public License +dnl along with this program. If not, see . +dnl +dnl Julian Day functions for the server side. +dnl Karl O. Pinc +dnl +dnl +dnl m4 includes +include(`copyright.m4') +include(`constants.m4') +include(`macros.m4') +include(`functions.m4') +dnl + +-- +-- Convert julian date to other data type functions. +-- + +CREATE OR REPLACE FUNCTION julian_to(julian_day INT) + RETURNS DATE + LANGUAGE plpgsql + IMMUTABLE + sdb_function_set_search_path + AS $$ + + -- Convert a Julian Day to its corresponding date. + -- + -- AGPL_notice(` --', `2004, 2008', `Karl O. Pinc ') + -- + -- Syntax: julian_to(julian_day) + -- + -- Input: + -- julian_date The date to convert. + -- + -- Returns: + -- The date value for the given Julian Day. + -- + -- Remarks: + -- Really ought to be built-into postgresql. + + DECLARE + day_zero CONSTANT DATE + := CURRENT_DATE - CAST (to_char(CURRENT_DATE, 'J') AS INT); + + BEGIN + RETURN day_zero + julian_day; + END; +$$; + +grant_everybody_func_priv(`julian_to(INT)') diff --git a/db/schemas/sokwedb/functions/drop/julian.m4 b/db/schemas/sokwedb/functions/drop/julian.m4 index c469236..acb3177 100644 --- a/db/schemas/sokwedb/functions/drop/julian.m4 +++ b/db/schemas/sokwedb/functions/drop/julian.m4 @@ -22,5 +22,3 @@ include(`copyright.m4') DROP FUNCTION IF EXISTS julian(DATE); DROP FUNCTION IF EXISTS julian(TIMESTAMP); - -DROP FUNCTION IF EXISTS julian_to(INT); diff --git a/db/schemas/sokwedb/functions/drop/julian_to.m4 b/db/schemas/sokwedb/functions/drop/julian_to.m4 new file mode 100644 index 0000000..2eb66f4 --- /dev/null +++ b/db/schemas/sokwedb/functions/drop/julian_to.m4 @@ -0,0 +1,23 @@ +dnl Copyright (C)2023 The Meme Factory, Inc., http://www.karlpinc.com/ +dnl +dnl This program is free software: you can redistribute it and/or modify +dnl it under the terms of the GNU Affero General Public License as published +dnl by the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU Affero General Public License for more details. +dnl +dnl You should have received a copy of the GNU Affero General Public License +dnl along with this program. If not, see . +dnl +dnl Drop Julian Day functions for the server side. +dnl Karl O. Pinc +dnl +dnl +dnl m4 includes +include(`copyright.m4') + +DROP FUNCTION IF EXISTS julian_to(INT); -- 2.34.1