Merge branch 'master' into 103-Extension_Group_API

This commit is contained in:
Juan Ignacio Sánchez Lara 2015-09-21 14:52:37 +02:00
commit 8fdf5cb9c4

View File

@ -688,16 +688,20 @@ BEGIN
END; END;
$$ LANGUAGE 'plpgsql'; $$ LANGUAGE 'plpgsql';
DO $$
CREATE TYPE _cdb_has_usable_geom_record BEGIN
AS (has_usable_geoms boolean, IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = '_cdb_has_usable_geom_record') THEN
text_geom_column boolean, CREATE TYPE _cdb_has_usable_geom_record
text_geom_column_name text, AS (has_usable_geoms boolean,
text_geom_column_srid boolean, text_geom_column boolean,
has_geom boolean, text_geom_column_name text,
has_geom_name text, text_geom_column_srid boolean,
has_mercgeom boolean, has_geom boolean,
has_mercgeom_name text); has_geom_name text,
has_mercgeom boolean,
has_mercgeom_name text);
END IF;
END$$;
DROP FUNCTION IF EXISTS _CDB_Has_Usable_Geom(REGCLASS); DROP FUNCTION IF EXISTS _CDB_Has_Usable_Geom(REGCLASS);
CREATE OR REPLACE FUNCTION _CDB_Has_Usable_Geom(reloid REGCLASS) CREATE OR REPLACE FUNCTION _CDB_Has_Usable_Geom(reloid REGCLASS)