Merge branch 'master' into 103-Extension_Group_API

This commit is contained in:
Juan Ignacio Sánchez Lara 2015-08-20 10:17:00 +02:00
commit 9c70e5f91a
3 changed files with 9 additions and 6 deletions

View File

@ -1,7 +1,7 @@
# cartodb/Makefile # cartodb/Makefile
EXTENSION = cartodb EXTENSION = cartodb
EXTVERSION = 0.9.0 EXTVERSION = 0.9.1
SED = sed SED = sed
@ -43,6 +43,7 @@ UPGRADABLE = \
0.8.1 \ 0.8.1 \
0.8.2 \ 0.8.2 \
0.9.0 \ 0.9.0 \
0.9.1 \
$(EXTVERSION)dev \ $(EXTVERSION)dev \
$(EXTVERSION)next \ $(EXTVERSION)next \
$(END) $(END)

View File

@ -2,6 +2,10 @@ X.Y.Z (2015-mm-dd)
------------------ ------------------
* Groups API * Groups API
0.9.1 (2015-08-19)
------------------
* Fix for transformation to webmercator in corner cases [#116](https://github.com/CartoDB/cartodb-postgresql/issues/116)
0.9.0 (2015-08-19) 0.9.0 (2015-08-19)
------------------ ------------------
* Re-implementation of `CDB_CartodbfyTable` functions * Re-implementation of `CDB_CartodbfyTable` functions

View File

@ -910,9 +910,7 @@ BEGIN
|| postgis_typmod_type(a.atttypmod) || postgis_typmod_type(a.atttypmod)
|| ', 4326) AS ' || ', 4326) AS '
|| const.geomcol || const.geomcol
|| ', ST_Transform(' || ', cartodb.CDB_TransformToWebmercator(' || a.attname || ')::Geometry('
|| a.attname
|| ',3857)::Geometry('
|| postgis_typmod_type(a.atttypmod) || postgis_typmod_type(a.atttypmod)
|| ', 3857) AS ' || ', 3857) AS '
|| const.mercgeomcol, || const.mercgeomcol,