Merge branch 'develop' into iss66-cast-geom-ids-to-text

src/pg/sql/44_observatory_geometries.sql

@@ -119,7 +119,7 @@ BEGIN
   -- If not point, raise error
   IF ST_GeometryType(geom) != 'ST_Point'
   THEN
-    RAISE EXCEPTION 'Error: Invalid geometry type (%), expecting ''ST_Point''', ST_GeometryType(geom);
+    RAISE EXCEPTION 'Invalid geometry type (%), expecting ''ST_Point''', ST_GeometryType(geom);
   END IF;
 
   -- choose appropriate table based on time_span
@@ -143,7 +143,7 @@ BEGIN
   -- if no tables are found, raise notice and return null
   IF target_table IS NULL
   THEN
-    RAISE NOTICE 'No boundaries found for ''%''', boundary_id;
+    RAISE NOTICE 'Warning: No boundaries found for ''%''', boundary_id;
     RETURN NULL::text;
   END IF;
 
@@ -545,9 +545,9 @@ BEGIN
   RETURN QUERY
   EXECUTE
   format($string$
-    SELECT geoid_ct.colname As geoid_colname,
-           tablename,
-           geom_ct.colname As geom_colname
+    SELECT geoid_ct.colname::text As geoid_colname,
+           tablename::text,
+           geom_ct.colname::text As geom_colname
     FROM observatory.obs_column_table As geoid_ct,
          observatory.obs_table As geom_t,
          observatory.obs_column_table As geom_ct,
@@ -569,6 +569,7 @@ BEGIN
     --  AND geom_t.timespan = '%s' <-- put in requested year
     -- TODO: filter by clipped vs. not so appropriate tablename are unique
     --       so the limit 1 can be removed
+    RETURN;
 
 END;
 $$ LANGUAGE plpgsql;