Skip to content

Commit fe4bffa

Browse files
SimonGoringSimonGoring
committed
Some function cleanup.
1 parent c9d817d commit fe4bffa

File tree

7 files changed

+44
-10
lines changed

7 files changed

+44
-10
lines changed

‎function/ti/getelementtypebyname.sql‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
CREATE OR REPLACE FUNCTION ti.getelementtypebyname(_elementtype character varying)
22
RETURNS TABLE(elementtypeid integer, elementtype character varying)
3-
LANGUAGE SQL
4-
AS $$
3+
LANGUAGE sql
4+
AS $function$
55

66
SELECT elementtypeid, elementtype
77
FROM ndb.elementtypes
88
WHERE elementtype ILIKE _elementtype
99

10-
$$
10+
$function$

‎function/ti/geteventtypebyname.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ AS $function$
55
SELECT eventtypeid, eventtype
66
FROM ndb.eventtypes
77
WHERE eventtype ILIKE $1
8-
$function$;
8+
$function$

‎function/ti/getrecentuploads.sql‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
CREATE OR REPLACE FUNCTION ti.getrecentuploads(_months integer DEFAULT 1, _databaseid integer DEFAULT NULL::integer, _datasettypeid integer DEFAULT NULL::integer, _limit integer DEFAULT 400) RETURNS TABLE(datasetid integer, datasettype CHARACTER varying, sitename CHARACTER varying, geopolitical CHARACTER varying, databasename CHARACTER varying, investigator CHARACTER varying, recdatecreated CHARACTER varying, steward CHARACTER varying) LANGUAGE SQL AS $function$
1+
CREATE OR REPLACE FUNCTION ti.getrecentuploads(_months integer DEFAULT 1, _databaseid integer DEFAULT NULL::integer, _datasettypeid integer DEFAULT NULL::integer, _limit integer DEFAULT 400)
2+
RETURNS TABLE(datasetid integer, datasettype character varying, sitename character varying, geopolitical character varying, databasename character varying, investigator character varying, recdatecreated character varying, steward character varying)
3+
LANGUAGE sql
4+
AS $function$
25
SELECT ds.datasetid,
36
dst.datasettype,
47
sts.sitename,
@@ -30,4 +33,4 @@ CREATE OR REPLACE FUNCTION ti.getrecentuploads(_months integer DEFAULT 1, _datab
3033
order by ds.recdatecreated desc
3134

3235
LIMIT _limit
33-
$function$;
36+
$function$

‎function/ts/deletedepenvttype.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
CREATE OR REPLACE FUNCTION ts.deletedepenvttype(_depenvtid integer) RETURNS void LANGUAGE SQL AS $function$
1+
CREATE OR REPLACE FUNCTION ts.deletedepenvttype(_depenvtid integer)
2+
RETURNS void
3+
LANGUAGE sql
4+
AS $function$
25
DELETE FROM ndb.depenvttypes AS dvt
36
WHERE dvt.depenvtid = _depenvtid;
47
$function$

‎function/ts/deletesynonymy.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
CREATE OR REPLACE FUNCTION ts.deletesynonymy(_synonymyid integer, _contactid integer) RETURNS void LANGUAGE SQL AS $function$
1+
CREATE OR REPLACE FUNCTION ts.deletesynonymy(_synonymyid integer, _contactid integer)
2+
RETURNS void
3+
LANGUAGE sql
4+
AS $function$
25
DELETE FROM ndb.synonymy AS sy
36
WHERE sy.synonymyid = _synonymyid;
47

‎function/ts/insertanalysisunitaltdepth.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
CREATE OR REPLACE FUNCTION ts.insertanalysisunitaltdepth(_analysisunitid integer, _altdepthscaleid integer, _altdepth double precision) RETURNS void LANGUAGE SQL AS $function$
1+
CREATE OR REPLACE FUNCTION ts.insertanalysisunitaltdepth(_analysisunitid integer, _altdepthscaleid integer, _altdepth double precision)
2+
RETURNS void
3+
LANGUAGE sql
4+
AS $function$
25
INSERT INTO ndb.analysisunitaltdepths(analysisunitid, altdepthscaleid, altdepth)
36
VALUES (_analysisunitid, _altdepthscaleid, _altdepth)
47
$function$

‎function/ts/insertpublication.sql‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
1-
CREATE OR REPLACE FUNCTION ts.insertpublication(_pubtypeid integer, _year character varying DEFAULT NULL::character varying, _citation character varying DEFAULT NULL::character varying, _title character varying DEFAULT NULL::character varying, _journal character varying DEFAULT NULL::character varying, _vol character varying DEFAULT NULL::character varying, _issue character varying DEFAULT NULL::character varying, _pages character varying DEFAULT NULL::character varying, _citnumber character varying DEFAULT NULL::character varying, _doi character varying DEFAULT NULL::character varying, _booktitle character varying DEFAULT NULL::character varying, _numvol character varying DEFAULT NULL::character varying, _edition character varying DEFAULT NULL::character varying, _voltitle character varying DEFAULT NULL::character varying, _sertitle character varying DEFAULT NULL::character varying, _servol character varying DEFAULT NULL::character varying, _publisher character varying DEFAULT NULL::character varying, _url character varying DEFAULT NULL::character varying, _city character varying DEFAULT NULL::character varying, _state character varying DEFAULT NULL::character varying, _country character varying DEFAULT NULL::character varying, _origlang character varying DEFAULT NULL::character varying, _notes character varying DEFAULT NULL::character varying)
1+
CREATE OR REPLACE FUNCTION ts.insertpublication(_pubtypeid integer,
2+
_year character varying DEFAULT NULL::character varying,
3+
_citation character varying DEFAULT NULL::character varying,
4+
_title character varying DEFAULT NULL::character varying,
5+
_journal character varying DEFAULT NULL::character varying,
6+
_vol character varying DEFAULT NULL::character varying,
7+
_issue character varying DEFAULT NULL::character varying,
8+
_pages character varying DEFAULT NULL::character varying,
9+
_citnumber character varying DEFAULT NULL::character varying,
10+
_doi character varying DEFAULT NULL::character varying,
11+
_booktitle character varying DEFAULT NULL::character varying,
12+
_numvol character varying DEFAULT NULL::character varying,
13+
_edition character varying DEFAULT NULL::character varying,
14+
_voltitle character varying DEFAULT NULL::character varying,
15+
_sertitle character varying DEFAULT NULL::character varying,
16+
_servol character varying DEFAULT NULL::character varying,
17+
_publisher character varying DEFAULT NULL::character varying,
18+
_url character varying DEFAULT NULL::character varying,
19+
_city character varying DEFAULT NULL::character varying,
20+
_state character varying DEFAULT NULL::character varying,
21+
_country character varying DEFAULT NULL::character varying,
22+
_origlang character varying DEFAULT NULL::character varying,
23+
_notes character varying DEFAULT NULL::character varying)
224
RETURNS integer
325
LANGUAGE sql
426
AS $function$

0 commit comments

Comments
 (0)