Merge branch 'master' into explorerFixes

SimonGoring · SimonGoring · commit f61b1231691c · 2020-12-17T12:17:55.000-08:00
diff --git a/function/ap/explorersearch.sql b/function/ap/explorersearch.sql
@@ -193,7 +193,7 @@ BEGIN
                   _ageyoung := -250;
                 END IF;
 
-                IF _ageDoContain = true THEN
+                IF _agedocontain = true THEN
                   cteAgesWhere := cteAgesWhere || '
                       AND (
                         (' || _ageyoung || '<= sa.age AND sa.age <= ' || _ageold || ') OR
@@ -250,7 +250,7 @@ BEGIN
                 AND sd.elementtypeid IN (array_to_string(' || _elemtypeids || ','',''))';
         END IF;
 
-        IF ageDoContain = false THEN
+        IF _agedocontain = false THEN
             cteAges := cteAges || '
             AND NOT (c.calageolder < ' || _ageyoung || ' OR ' || _ageold || ' < c.calageyounger)';
         ELSE
@@ -409,7 +409,7 @@ BEGIN
     IF noTaxa = true AND NOT (_ageold IS NULL AND _ageyoung IS NULL) THEN
       BEGIN
         IF _ageold IS NULL THEN
-          _ageold:= 10000000;
+          _ageold := 10000000;
         END IF;
         IF _ageyoung IS NULL THEN
           _ageyoung := -250;
@@ -423,8 +423,8 @@ BEGIN
         ELSE
             cteDsWhere := cteDsWhere || '
               AND (
-                NOT (ages.ageyoungest < ' || _ageold || ' OR ages.ageoldest > ' || _ageyoung ' ) OR
-                NOT (ages.agemin < ' || _ageold || ' OR ages.agemax > ' || _ageyoung || ')
+                (' || _ageyoung || ' <= ages.ageyoungest AND ages.ageoldest <= ' || _ageold || ' ) OR
+            	  NOT (ages.maxage < ' || _ageyoung || ' OR ' || _ageold || ' < ages.minage)
               )';
         END IF;
       END;
diff --git a/function/doi/doifreeze.sql b/function/doi/doifreeze.sql
@@ -1,5 +1,5 @@
 CREATE OR REPLACE FUNCTION doi.doifreeze(dsid integer[])
- RETURNS TABLE(datasetid integer, frozendata json)
+ RETURNS TABLE(datasetid integer, record json)
  LANGUAGE sql
 AS $function$
 WITH chronmeta AS (
@@ -17,7 +17,7 @@ SELECT * FROM doi.ndbdata(dsid)
 
 SELECT ids.dsid AS datasetid,
 			 json_strip_nulls(json_build_object('chronologies', jsonb_build_object('chronologies', chr.chronologies),
-															'data', dt.data)) AS download
+															'data', dt.data)) AS record
 FROM
 	datameta  AS dt
 	JOIN chronmeta AS chr ON dt.datasetid = chr.datasetid
diff --git a/function/ndb/getalltables.sql b/function/ndb/getalltables.sql
@@ -0,0 +1,12 @@
+CREATE OR REPLACE FUNCTION ndb.getalltables(_schema text)
+  RETURNS TABLE(schema text, "table" text,
+                "column" text, data_type text,
+                "default" text)
+  LANGUAGE sql
+AS
+$function$
+  SELECT table_schema, table_name, column_name, data_type, column_default
+  FROM   information_schema.columns
+  WHERE table_schema = _schema
+  ORDER  BY table_name, ordinal_position;
+$function$
