cartodb/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'carto/master' into 2273_support

Browse Source
This commit is contained in:
Raúl Marín 2019-12-24 14:14:33 +01:00
commit ecf0a06448
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -16,9 +16,6 @@ jobs:
- env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5" - env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5"
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5" - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3" - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
allow_failures:
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="2.5"
- env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
script: script:
- sudo service postgresql stop; - sudo service postgresql stop;

7
Makefile
View File

@ -1,7 +1,7 @@
# cartodb/Makefile # cartodb/Makefile
EXTENSION = cartodb EXTENSION = cartodb
EXTVERSION = 0.33.0 EXTVERSION = 0.34.0
SED = sed SED = sed
AWK = awk AWK = awk
@ -106,6 +106,7 @@ UPGRADABLE = \
0.31.0 \ 0.31.0 \
0.32.0 \ 0.32.0 \
0.33.0 \ 0.33.0 \
0.34.0 \
$(EXTVERSION)dev \ $(EXTVERSION)dev \
$(EXTVERSION)next \ $(EXTVERSION)next \
$(END) $(END)
@ -139,9 +140,7 @@ PG_VERSION := $(shell $(PG_CONFIG) --version | $(AWK) '{split($$2,a,"."); print
PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true) PG_12_GE := $(shell [ $(PG_VERSION) -ge 12 ] && echo true)
PLPYTHONU := plpythonu PLPYTHONU := plpythonu
ifeq ($(PG_12_GE), true) ifeq ($(PG_12_GE), true)
# Reverted until we are ready for PG12 support in other projects PLPYTHONU := plpython3u
PLPYTHONU := plpythonu
# PLPYTHONU := plpython3u
endif endif
PGPORT ?= '5432' PGPORT ?= '5432'
PGUSER ?= 'postgres' PGUSER ?= 'postgres'

7
NEWS.md
View File

@ -1,3 +1,10 @@
0.35.0 (XXXX-XX-XX)
* Reapply the changes in 0.33.0 (the issue we were looking for was unrelated)
* Reapply `Make PG12 depend on plpython3u instead of plpythonu`
0.34.0 (2019-12-23)
* Revert changes done in 0.33.0, keeping function signature to drop them
0.33.0 (2019-12-20) 0.33.0 (2019-12-20)
* Revert `Make PG12 depend on plpython3u instead of plpythonu`. * Revert `Make PG12 depend on plpython3u instead of plpythonu`.
* Add functions to manage Federated Tables (Foreign Data Wrapper) * Add functions to manage Federated Tables (Foreign Data Wrapper)

13
scripts-available/CDB_Organizations.sql
View File

@ -6,6 +6,13 @@ AS $$
$$ $$
LANGUAGE SQL STABLE PARALLEL SAFE; LANGUAGE SQL STABLE PARALLEL SAFE;
----- ########################## WARNING ##########################
----- The code below creates a new role for the organization but
----- only when the extension is INSTALLED in a database, i.e. it
----- won't work if you clone a database that has it installed.
----- If you do, you need to update the extension to next and back
----- ########################## WARNING ##########################
DO LANGUAGE 'plpgsql' $$ DO LANGUAGE 'plpgsql' $$
DECLARE DECLARE
cdb_org_member_role_name TEXT; cdb_org_member_role_name TEXT;
@ -38,6 +45,12 @@ AS $$
$$ $$
LANGUAGE SQL STABLE PARALLEL SAFE; LANGUAGE SQL STABLE PARALLEL SAFE;
----- ########################## WARNING ##########################
----- The code below creates a new role for the organization but
----- only when the extension is INSTALLED in a database, i.e. it
----- won't work if you clone a database that has it installed.
----- If you do, you need to update the extension to next and back
----- ########################## WARNING ##########################
-- Administrator role creation on extension install -- Administrator role creation on extension install
DO LANGUAGE 'plpgsql' $$ DO LANGUAGE 'plpgsql' $$
DECLARE DECLARE