Merge branch 'release-v-0.0.6' into fix-geom_geoid_colname

This commit is contained in:
John Krauss
2016-06-27 12:39:09 -04:00
7 changed files with 10137 additions and 8794 deletions

View File

@@ -199,3 +199,20 @@ BEGIN
RETURN result;
END;
$$ LANGUAGE plpgsql;
-- Function that returns the currently deployed obs_dump_version from the
-- remote table of the same name.
CREATE OR REPLACE FUNCTION cdb_observatory.OBS_DumpVersion(
)
RETURNS TEXT
AS $$
DECLARE
result text;
BEGIN
EXECUTE '
SELECT MAX(dump_id) FROM observatory.obs_dump_version
' INTO result;
RETURN result;
END;
$$ LANGUAGE plpgsql;

View File

@@ -114,7 +114,7 @@ BEGIN
AND
observatory.OBS_column.type = 'Geometry'
AND
$1 && bounds::box2d
ST_Intersects($1, observatory.obs_table.the_geom)
$string$ || timespan_query
USING geom;
RETURN;