Updating taxonname variable type in returned tables.

SimonGoring · SimonGoring · commit 5c54b61971cc · 2023-03-16T12:48:24.000-07:00
A sed replace operation (largely). Changing taxonname (and aliases) to text from character varying.
diff --git a/function/ti/getbiochemdatasetbyid.sql b/function/ti/getbiochemdatasetbyid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getbiochemdatasetbyid(_datasetid integer)
- RETURNS TABLE(sampleid integer, analysisunitname character varying, samplename character varying, sampledate character varying, taxonname character varying, variable character varying, variableelement character varying, variableunits character varying, value double precision)
+ RETURNS TABLE(sampleid integer, analysisunitname character varying, samplename character varying, sampledate character varying, taxonname text, variable character varying, variableelement character varying, variableunits character varying, value double precision)
  LANGUAGE plpgsql
 AS $function$
 DECLARE
diff --git a/function/ti/getchildtaxaforallsites.sql b/function/ti/getchildtaxaforallsites.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getchildtaxaforallsites(_taxonname character varying)
- RETURNS TABLE(taxonid integer, taxonname character varying, sitename character varying)
+ RETURNS TABLE(taxonid integer, taxonname text, sitename character varying)
  LANGUAGE sql
 AS $function$
 WITH RECURSIVE taxacte
diff --git a/function/ti/getdatasetsbytaxon.sql b/function/ti/getdatasetsbytaxon.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasetsbytaxon(_taxon character varying)
- RETURNS TABLE(taxonname character varying, variableelement character varying, datasetid integer, datasettype character varying, collectionunitid integer, siteid integer, sitename character varying)
+ RETURNS TABLE(taxonname text, variableelement character varying, datasetid integer, datasettype character varying, collectionunitid integer, siteid integer, sitename character varying)
  LANGUAGE sql
 AS $function$
 SELECT ndb.taxa.taxonname, ndb.variableelements.variableelement, ndb.datasets.datasetid, ndb.datasettypes.datasettype, ndb.collectionunits.collectionunitid, 
diff --git a/function/ti/getdatasetspecimendates.sql b/function/ti/getdatasetspecimendates.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasetspecimendates(_datasetid integer)
- RETURNS TABLE(specimenid integer, analysisunitname character varying, depth double precision, thickness double precision, taxonname character varying, variableunits character varying, variablecontext character varying, elementtype character varying, symmetry character varying, portion character varying, maturity character varying, sex character varying, domesticstatus character varying, nisp double precision, preservative character varying, repository character varying, specimennr character varying, fieldnr character varying, arctosnr character varying, genbanknr character varying, notes text, geochrontype character varying, labnumber character varying, fraction character varying, age double precision, errorolder double precision, erroryounger double precision, infinite boolean, calageolder double precision, calageyounger double precision, calibrationcurve character varying, calibrationprogram character varying, version character varying)
+ RETURNS TABLE(specimenid integer, analysisunitname character varying, depth double precision, thickness double precision, taxonname text, variableunits character varying, variablecontext character varying, elementtype character varying, symmetry character varying, portion character varying, maturity character varying, sex character varying, domesticstatus character varying, nisp double precision, preservative character varying, repository character varying, specimennr character varying, fieldnr character varying, arctosnr character varying, genbanknr character varying, notes text, geochrontype character varying, labnumber character varying, fraction character varying, age double precision, errorolder double precision, erroryounger double precision, infinite boolean, calageolder double precision, calageyounger double precision, calibrationcurve character varying, calibrationprogram character varying, version character varying)
  LANGUAGE sql
 AS $function$
 SELECT 
diff --git a/function/ti/getdatasetspecimens.sql b/function/ti/getdatasetspecimens.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasetspecimens(_datasetid integer)
- RETURNS TABLE(specimenid integer, dataid integer, elementtype character varying, symmetry character varying, portion character varying, maturity character varying, sex character varying, domesticstatus character varying, preservative character varying, nisp double precision, repository character varying, specimennr character varying, fieldnr character varying, arctosnr character varying, notes text, taxonname character varying, taxagroup character varying)
+ RETURNS TABLE(specimenid integer, dataid integer, elementtype character varying, symmetry character varying, portion character varying, maturity character varying, sex character varying, domesticstatus character varying, preservative character varying, nisp double precision, repository character varying, specimennr character varying, fieldnr character varying, arctosnr character varying, notes text, taxonname text, taxagroup character varying)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/getdatasettaxonnotes.sql b/function/ti/getdatasettaxonnotes.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasettaxonnotes(_datasetid integer)
- RETURNS TABLE(taxonid integer, taxonname character varying, notes text)
+ RETURNS TABLE(taxonid integer, taxonname text, notes text)
  LANGUAGE sql
 AS $function$ 
 SELECT ndb.datasettaxonnotes.taxonid, ndb.taxa.taxonname, ndb.datasettaxonnotes.notes
diff --git a/function/ti/getdatasettaxonnotesbytaxonid.sql b/function/ti/getdatasettaxonnotesbytaxonid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasettaxonnotesbytaxonid(_datasetid integer, _taxonid integer)
- RETURNS TABLE(taxonid integer, taxonname character varying, notes text)
+ RETURNS TABLE(taxonid integer, taxonname text, notes text)
  LANGUAGE sql
 AS $function$
   SELECT dtn.taxonid,
@@ -9,4 +9,4 @@ AS $function$
     INNER JOIN      ndb.taxa AS tx ON dtn.taxonid = tx.taxonid
   WHERE dtn.datasetid = _datasetid
     AND dtn.taxonid = _taxonid
-$function$
+$function$;
diff --git a/function/ti/getdatasetvariables.sql b/function/ti/getdatasetvariables.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasetvariables(_datasetid integer)
- RETURNS TABLE(variableid integer, taxoncode character varying, taxonname character varying, author character varying, variableelement character varying, variableunits character varying, variablecontext character varying)
+ RETURNS TABLE(variableid integer, taxoncode character varying, taxonname text, author character varying, variableelement character varying, variableunits character varying, variablecontext character varying)
  LANGUAGE sql
 AS $function$ 
 SELECT ndb.data.variableid, ndb.taxa.taxoncode, ndb.taxa.taxonname, ndb.taxa.author, ndb.variableelements.variableelement,
@@ -15,4 +15,4 @@ FROM ndb.variableelements RIGHT OUTER JOIN
 WHERE ndb.samples.datasetid = _datasetid
 GROUP BY ndb.data.variableid, ndb.taxa.taxoncode, ndb.taxa.taxonname, ndb.taxa.author, ndb.variableelements.variableelement,
 	ndb.variableunits.variableunits, ndb.variablecontexts.variablecontext
-$function$
+$function$;
diff --git a/function/ti/getdatasetvariablesynonyms.sql b/function/ti/getdatasetvariablesynonyms.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getdatasetvariablesynonyms(_datasetid integer, _variableid integer)
- RETURNS TABLE(synonymyid integer, reftaxonname character varying, fromcontributor boolean, publicationid integer, notes text)
+ RETURNS TABLE(synonymyid integer, reftaxonname text, fromcontributor boolean, publicationid integer, notes text)
  LANGUAGE sql
 AS $function$
 SELECT ndb.synonymy.synonymyid, ndb.taxa.taxonname as reftaxonname, ndb.synonymy.fromcontributor, ndb.synonymy.publicationid,
diff --git a/function/ti/getinvalidtaxabytaxagroupid.sql b/function/ti/getinvalidtaxabytaxagroupid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getinvalidtaxabytaxagroupid(_taxagroupid character varying)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/getinvalidtaxabytaxagroupidlist.sql b/function/ti/getinvalidtaxabytaxagroupidlist.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getinvalidtaxabytaxagroupidlist(_taxagrouplist text)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/getinvalidtaxonbyname.sql b/function/ti/getinvalidtaxonbyname.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getinvalidtaxonbyname(_taxonname character varying)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/getspecimendatebyspecimendateid.sql b/function/ti/getspecimendatebyspecimendateid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getspecimendatebyspecimendateid(_specimendateid integer)
-RETURNS TABLE(specimenid integer, taxonid integer, taxonname character varying, elementtypeid integer,
+RETURNS TABLE(specimenid integer, taxonid integer, taxonname text, elementtypeid integer,
 	elementtype character varying, fractionid integer, fraction character varying, sampleid integer, notes character varying)
 LANGUAGE sql
 AS $function$
diff --git a/function/ti/getspecimendatesbygeochrondatasetid.sql b/function/ti/getspecimendatesbygeochrondatasetid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getspecimendatesbygeochrondatasetid(_geochrondatasetid integer)
- RETURNS TABLE(specimendateid integer, specimenid integer, geochronid integer, sampleid integer, taxonname character varying, elementtype character varying, fraction character varying, notes character varying, calage double precision, calageolder double precision, calageyounger double precision, calibrationcurve character varying, calibrationprogram character varying, version character varying)
+ RETURNS TABLE(specimendateid integer, specimenid integer, geochronid integer, sampleid integer, taxonname text, elementtype character varying, fraction character varying, notes character varying, calage double precision, calageolder double precision, calageyounger double precision, calibrationcurve character varying, calibrationprogram character varying, version character varying)
  LANGUAGE sql
 AS $function$
   SELECT sdt.specimendateid,
diff --git a/function/ti/getsynonymsforinvalidtaxonid.sql b/function/ti/getsynonymsforinvalidtaxonid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getsynonymsforinvalidtaxonid(_invalidtaxonid integer)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying, synonymtypeid integer)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying, synonymtypeid integer)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/getsynonymsforvalidtaxonid.sql b/function/ti/getsynonymsforvalidtaxonid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getsynonymsforvalidtaxonid(_validtaxonid integer)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying, synonymtypeid integer)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying, synonymtypeid integer)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/gettaxabycodeandtaxagroupid.sql b/function/ti/gettaxabycodeandtaxagroupid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxabycodeandtaxagroupid(_taxoncode character varying, _taxagroupid character varying)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/gettaxabynamelist.sql b/function/ti/gettaxabynamelist.sql
@@ -1,23 +1,9 @@
 CREATE OR REPLACE FUNCTION ti.gettaxabynamelist(_taxanames text)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
- LANGUAGE plpgsql
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
+ LANGUAGE sql
 AS $function$
-Declare taxaarray text[];
-	
-  
-BEGIN
-
-
-taxaarray := string_to_array(_taxanames,'$');
-
-Return query 
-
-select t.taxonid, t.taxoncode, t.taxonname, t.author, t.valid, t.highertaxonid, t.extinct, t.taxagroupid, t.publicationid, 
-       t.validatorid, t.validatedate::varchar(10) as validatedate, t.notes
-from ndb.taxa t
-where t.taxonname ILIKE ANY (taxaarray);
-
-
-
-END
+       select t.taxonid, t.taxoncode, t.taxonname, t.author, t.valid, t.highertaxonid, t.extinct, t.taxagroupid, t.publicationid, 
+              t.validatorid, t.validatedate::varchar(10) as validatedate, t.notes
+       from ndb.taxa t
+       where t.taxonname ILIKE ANY (string_to_array(_taxanames,'$'));
 $function$
diff --git a/function/ti/gettaxabytaxagroupid.sql b/function/ti/gettaxabytaxagroupid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxabytaxagroupid(_taxagroupid character varying)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
  LANGUAGE sql
 AS $function$
 select tx.taxonid, 
diff --git a/function/ti/gettaxalookupsynonymybytaxagroupidlist.sql b/function/ti/gettaxalookupsynonymybytaxagroupidlist.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxalookupsynonymybytaxagroupidlist(_taxagrouplist character varying)
- RETURNS TABLE(taxonid integer, taxonname character varying, validtaxonid integer)
+ RETURNS TABLE(taxonid integer, taxonname text, validtaxonid integer)
  LANGUAGE sql
 AS $function$
 
diff --git a/function/ti/gettaxatable.sql b/function/ti/gettaxatable.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxatable()
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes text)
  LANGUAGE sql
 AS $function$
 SELECT taxonid, taxoncode, taxonname, author, valid, highertaxonid, extinct, taxagroupid, publicationid, 
diff --git a/function/ti/gettaxonbyid.sql b/function/ti/gettaxonbyid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxonbyid(_taxonid integer)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
  LANGUAGE sql
 AS $function$
 select      tx.taxonid, 
diff --git a/function/ti/gettaxonbyname.sql b/function/ti/gettaxonbyname.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxonbyname(_taxonname character varying)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
  LANGUAGE sql
 AS $function$
 select      tx.taxonid, 
diff --git a/function/ti/gettaxonhierarchy.sql b/function/ti/gettaxonhierarchy.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.gettaxonhierarchy(_taxonname character varying)
- RETURNS TABLE(taxonid integer, taxonname character varying, valid boolean, highertaxonid integer)
+ RETURNS TABLE(taxonid integer, taxonname text, valid boolean, highertaxonid integer)
  LANGUAGE sql
 AS $function$
 WITH RECURSIVE lowertaxa AS (SELECT
diff --git a/function/ti/getvalidtaxonbyname.sql b/function/ti/getvalidtaxonbyname.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getvalidtaxonbyname(_taxonname character varying)
- RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname character varying, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
+ RETURNS TABLE(taxonid integer, taxoncode character varying, taxonname text, author character varying, valid boolean, highertaxonid integer, extinct boolean, taxagroupid character varying, publicationid integer, validatorid integer, validatedate character varying, notes character varying)
  LANGUAGE sql
 AS $function$
   SELECT
diff --git a/function/ti/getvariabletextbyid.sql b/function/ti/getvariabletextbyid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getvariabletextbyid(_variableid integer)
- RETURNS TABLE(taxonname character varying, variableelement character varying, variableunits character varying, variablecontext character varying)
+ RETURNS TABLE(taxonname text, variableelement character varying, variableunits character varying, variablecontext character varying)
  LANGUAGE sql
 AS $function$
 SELECT tx.taxonname,
diff --git a/function/ti/getvariabletexybyid.sql b/function/ti/getvariabletexybyid.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION ti.getvariabletexybyid(variableid integer)
- RETURNS TABLE(taxonname character varying, variableelement character varying, variableunits character varying, variablecontext character varying)
+ RETURNS TABLE(taxonname text, variableelement character varying, variableunits character varying, variablecontext character varying)
  LANGUAGE sql
 AS $function$
 SELECT tx.taxonname,
diff --git a/helpers/localDup.sh b/helpers/localDup.sh
