Skip to content

Commit 540704c

Browse files
committed
cleaned up ap and da schema functions
1 parent 3faac95 commit 540704c

15 files changed

+489
-1288
lines changed

function/AP/ap.getcollectiontypes.sql

Lines changed: 0 additions & 5 deletions
This file was deleted.

function/AP/ap.getdatasettypes.sql

Lines changed: 0 additions & 8 deletions
This file was deleted.

function/AP/ap.getdeptenvtypesroot.sql

Lines changed: 0 additions & 19 deletions
This file was deleted.

function/AP/ap.getkeywords.sql

Lines changed: 0 additions & 5 deletions
This file was deleted.

function/AP/ap.gettaphonomicsystems.sql

Lines changed: 0 additions & 8 deletions
This file was deleted.

function/AP/ap.gettaxagrouptypes.sql

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
CREATE OR REPLACE FUNCTION ap.gettaxaindatasets() RETURNS SETOF record
2-
AS $$
3-
SELECT t.taxonid, t.taxonname, t.taxagroupid, dtgt.datasettypeid
4-
FROM ndb.taxa AS t LEFT JOIN
5-
ndb.datasettaxagrouptypes AS dtgt ON t.taxagroupid = dtgt.taxagroupid INNER JOIN
6-
ndb.variables AS v ON t.taxonid = v.taxonid
7-
WHERE t.valid = 1
8-
GROUP BY t.taxonid, t.taxonname, dtgt.datasettypeid, t.taxagroupid
9-
ORDER BY t.taxonname, dtgt.datasettypeid
10-
$$ LANGUAGE SQL;
1+
CREATE OR REPLACE FUNCTION ap.gettaxaindatasets()
2+
RETURNS TABLE (taxonid integer, taxonname character varying, taxagroupid character varying, datasettypeid integer)
3+
AS $function$
4+
SELECT t.taxonid, t.taxonname, t.taxagroupid, dtgt.datasettypeid
5+
FROM ndb.taxa AS t LEFT JOIN
6+
ndb.datasettaxagrouptypes AS dtgt ON t.taxagroupid = dtgt.taxagroupid INNER JOIN
7+
ndb.variables AS v ON t.taxonid = v.taxonid
8+
WHERE t.valid = true
9+
GROUP BY t.taxonid, t.taxonname, dtgt.datasettypeid, t.taxagroupid
10+
ORDER BY t.taxonname, dtgt.datasettypeid
11+
$function$ LANGUAGE SQL;

0 commit comments

Comments
 (0)