Release version 0.20.0

Worked in pg10, but it didn't in pg9.5

.travis.yml

@@ -1,4 +1,6 @@
 language: c
+dist: precise
+sudo: required
 
 addons:
   postgresql: 9.5

CONTRIBUTING.md

@@ -22,13 +22,19 @@ and upgrade of the objects. This means using CREATE OR REPLACE for
 the functions, and whatever it takes to check existence of any previous
 version of objects in other cases.
 
+When adding a new function or modifying an exiting one make sure that the
+[VOLATILITY](https://www.postgresql.org/docs/current/static/xfunc-volatility.html) and [PARALLEL](https://www.postgresql.org/docs/9.6/static/parallel-safety.html) categories are updated accordingly.
+As PARALLEL labels need to be stripped for incompatible PostgreSQL versions
+please use _PARALLEL SAFE/RESTRICTED/UNSAFE_ in uppercase so it's handled
+automatically.
+
 When used as an extension (probably always from version 0.2.0 onwards)
 all the objects will be installed in a "cartodb" schema. Take this into
 account to fully-qualify internal calls to avoid (possibly dangerous)
 name clashes.
 
 Every new feature (as well as bugfixes) should come with a test case,
-see next section.
+see the 'Writing testcases' section.
 
 Writing testcases
 -----------------

Makefile

@@ -1,9 +1,10 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.19.2
+EXTVERSION = 0.20.0
 
 SED = sed
+AWK = awk
 
 CDBSCRIPTS = \
   scripts-enabled/*.sql \
@@ -82,6 +83,7 @@ UPGRADABLE = \
   0.19.0 \
   0.19.1 \
   0.19.2 \
+  0.20.0 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)
@@ -109,16 +111,22 @@ REGRESS = test_setup $(REGRESS_LEGACY)
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_PARALLEL := $(shell $(PG_CONFIG) --version | ($(AWK) '{$$2*=1000; if ($$2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0))
 include $(PGXS)
 
 $(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
 	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
 	cat $(CDBSCRIPTS) | \
-    $(SED) -e 's/public\./cartodb./g' \
-        -e 's/:DATABASE_USERNAME/cdb_org_admin/g' \
-        -e "s/''public''/''cartodb''/g" >> $@
+	$(SED) -e 's/public\./cartodb./g' \
+		-e 's/:DATABASE_USERNAME/cdb_org_admin/g' \
+		-e "s/''public''/''cartodb''/g" >> $@
 	echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@
 	cat cartodb_version.sql >> $@
+ifeq ($(PG_PARALLEL), 0)
+# Remove PARALLEL in aggregates and functions
+	$(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' \
+		-e 's/PARALLEL [A-Z]*/''/g' -i $@
+endif
 
 $(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql util/create_from_unpackaged.sh Makefile
 	./util/create_from_unpackaged.sh $(EXTVERSION)
@@ -131,6 +139,9 @@ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: $(EXTENSION)--$(EXTVERSION).
 
 $(EXTENSION).control: $(EXTENSION).control.in Makefile
 	$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
+ifeq ($(PG_PARALLEL), 0)
+	echo -e "\033[0;31mExtension created without PARALLEL support\033[0m"
+endif
 
 cartodb_version.sql: cartodb_version.sql.in Makefile $(GITDIR)/index
 	$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
@@ -143,18 +154,18 @@ legacy_regress: $(REGRESS_OLD) Makefile
 	mkdir -p expected/test/
 	mkdir -p results/test/
 	for f in $(REGRESS_OLD); do \
-    tn=`basename $${f} .sql`; \
-    of=sql/test/$${tn}.sql; \
-    echo '\set ECHO none' > $${of}; \
-    echo '\a' >> $${of}; \
-    echo '\t' >> $${of}; \
-    echo '\set QUIET off' >> $${of}; \
-    cat $${f} | \
-      $(SED) -e 's/public\./cartodb./g' >> $${of}; \
-    exp=expected/test/$${tn}.out; \
-    echo '\set ECHO none' > $${exp}; \
-    cat test/$${tn}_expect >> $${exp}; \
-  done
+		tn=`basename $${f} .sql`; \
+		of=sql/test/$${tn}.sql; \
+		echo '\set ECHO none' > $${of}; \
+		echo '\a' >> $${of}; \
+		echo '\t' >> $${of}; \
+		echo '\set QUIET off' >> $${of}; \
+		cat $${f} | \
+			$(SED) -e 's/public\./cartodb./g' >> $${of}; \
+		exp=expected/test/$${tn}.out; \
+		echo '\set ECHO none' > $${exp}; \
+		cat test/$${tn}_expect >> $${exp}; \
+	done
 
 test_organization:
 	bash test/organization/test.sh

NEWS.md

@@ -1,3 +1,6 @@
+0.20.0 (2017-11-08)
+* Added VOLATILITY and PARALLEL categories to all functions
+
 0.19.2 (2017-06-30)
 * Improved functions to generate unique identifiers #305
 

scripts-available/CDB_AnalysisCheck.sql

@@ -7,7 +7,7 @@ BEGIN
   RETURN CDB_Conf_GetConf('analysis_quota_factor')::text::float8;
 END;
 $$
-LANGUAGE 'plpgsql' STABLE SECURITY DEFINER;
+LANGUAGE 'plpgsql' STABLE PARALLEL SAFE SECURITY DEFINER;
 
 
 -- Get the factor (fraction of the quota) for Camshaft cached analysis tables
@@ -26,7 +26,7 @@ BEGIN
   RETURN factor;
 END;
 $$
-LANGUAGE 'plpgsql' STABLE;
+LANGUAGE 'plpgsql' STABLE PARALLEL SAFE;
 
 -- This checks the space used up by Camshaft cached analysis tables.
 -- An exception will be raised if the limits are exceeded.
@@ -59,4 +59,4 @@ BEGIN
     RAISE EXCEPTION 'Analysis cache space limits exceeded';
   END IF;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;

scripts-available/CDB_AnalysisSupport.sql

@@ -8,7 +8,7 @@ AS $$
   BEGIN
     RETURN table_name SIMILAR TO '\Aanalysis_[0-9a-f]{10}_[0-9a-f]{40}\Z';
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- This function returns a relation of Camshaft cached analysis tables in the given schema.
 -- If the schema name parameter is NULL, then tables from all schemas
@@ -19,7 +19,7 @@ CREATE OR REPLACE FUNCTION _CDB_AnalysisTablesInSchema(schema_name text DEFAULT
 RETURNS TABLE(table_regclass REGCLASS, schema_name TEXT, table_name TEXT)
 AS $$
   SELECT * FROM _CDB_UserTablesInSchema(schema_name) WHERE _CDB_IsAnalysisTableName(table_name);
-$$ LANGUAGE 'sql';
+$$ LANGUAGE 'sql' STABLE PARALLEL SAFE;
 
 -- This function returns a relation user tables excluding analysis tables
 -- If the schema name parameter is NULL, then tables from all schemas
@@ -30,7 +30,7 @@ CREATE OR REPLACE FUNCTION _CDB_NonAnalysisTablesInSchema(schema_name text DEFAU
 RETURNS TABLE(table_regclass REGCLASS, schema_name TEXT, table_name TEXT)
 AS $$
   SELECT * FROM _CDB_UserTablesInSchema(schema_name) WHERE Not _CDB_IsAnalysisTableName(table_name);
-$$ LANGUAGE 'sql';
+$$ LANGUAGE 'sql' STABLE PARALLEL SAFE;
 
 -- Total spaced used up by Camshaft cached analysis tables in the given schema.
 -- Scope: private.
@@ -52,4 +52,4 @@ BEGIN
   END IF;
 END;
 $$
-LANGUAGE 'plpgsql' VOLATILE;
+LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;

scripts-available/CDB_CartodbfyTable.sql

@@ -26,7 +26,7 @@ BEGIN
       RAISE EXCEPTION 'Please set user quota before cartodbfying tables.';
   END;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Drop cartodb triggers (might prevent changing columns)
 CREATE OR REPLACE FUNCTION _CDB_drop_triggers(reloid REGCLASS)
@@ -49,7 +49,7 @@ BEGIN
   sql := Format('DROP TRIGGER IF EXISTS test_quota_per_row ON %s', reloid::text);
   EXECUTE sql;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 
 -- Cartodb_id creation & validation or renaming if invalid
@@ -195,7 +195,7 @@ BEGIN
   END;
 
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 
 -- Create all triggers
@@ -235,7 +235,7 @@ BEGIN
          || ''')';
   EXECUTE sql;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- 8.b) Create all raster triggers
 -- NOTE: drop/create has the side-effect of re-enabling disabled triggers
@@ -267,7 +267,7 @@ BEGIN
          || ''')';
   EXECUTE sql;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 
 
@@ -279,7 +279,7 @@ BEGIN
   NEW.the_geom_webmercator := public.CDB_TransformToWebmercator(NEW.the_geom);
   RETURN NEW;
 END;
-$$ LANGUAGE plpgsql VOLATILE;
+$$ LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
 
 --- Trigger to update the updated_at column. No longer added by default
 --- but kept here for compatibility with old tables which still have this behavior
@@ -322,7 +322,7 @@ BEGIN
 
   RETURN is_raster;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL UNSAFE;
 
 
 
@@ -398,7 +398,7 @@ geomcol := 'the_geom';
 mercgeomcol := 'the_geom_webmercator';
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' IMMUTABLE PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION _CDB_Error(message TEXT, funcname TEXT DEFAULT '_CDB_Error')
@@ -409,7 +409,7 @@ BEGIN
   RAISE EXCEPTION 'CDB(%): %', funcname, message;
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL SAFE;
 
 
 CREATE OR REPLACE FUNCTION _CDB_SQL(sql TEXT, funcname TEXT DEFAULT '_CDB_SQL')
@@ -425,7 +425,7 @@ BEGIN
     RAISE EXCEPTION 'CDB(%:%:%): %', funcname, SQLSTATE, SQLERRM, sql;
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 -- DEPRECATED: Use _CDB_Unique_Identifier since it's UTF8 Safe and length
@@ -444,7 +444,7 @@ BEGIN
   RAISE EXCEPTION '_CDB_Unique_Relation_Name is DEPRECATED. Use _CDB_Unique_Identifier(prefix TEXT, relname TEXT, suffix TEXT, schema TEXT DEFAULT NULL)';
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL SAFE;
 
 
 -- DEPRECATED: Use _CDB_Unique_Column_Identifier since it's UTF8 Safe and length
@@ -463,7 +463,7 @@ BEGIN
   RAISE EXCEPTION '_CDB_Unique_Column_Name is DEPRECATED. Use _CDB_Unique_Column_Identifier(prefix TEXT, relname TEXT, suffix TEXT, reloid REGCLASS DEFAULT NULL)';
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL SAFE;
 
 
 -- Find out if the table already has a usable primary key
@@ -583,7 +583,7 @@ BEGIN
   -- Didn't find re-usable key, so return FALSE
   RETURN false;
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 CREATE OR REPLACE FUNCTION _CDB_Has_Usable_PK_Sequence(reloid REGCLASS)
@@ -603,7 +603,7 @@ BEGIN
 
   RETURN has_sequence;
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' STABLE PARALLEL SAFE;
 
 -- Return a set of columns that can be candidates to be the_geom[webmercator]
 -- with some extra information to analyze them.
@@ -632,7 +632,7 @@ BEGIN
     AND postgis_typmod_srid(a.atttypmod) IN (4326, 3857, 0)
     ORDER BY t.oid ASC;
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' STABLE PARALLEL SAFE;
 
 DO $$
 BEGIN
@@ -776,7 +776,7 @@ BEGIN
   RETURN rv;
     
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 -- Create a copy of the table. Assumes that the "Has usable" functions
@@ -1127,7 +1127,7 @@ BEGIN
   RETURN true;
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 -- Assumes the table already has the right metadata columns
@@ -1229,7 +1229,7 @@ BEGIN
   RETURN true;
 
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 DROP FUNCTION IF EXISTS CDB_CartodbfyTable(destschema TEXT, reloid REGCLASS);
 CREATE OR REPLACE FUNCTION CDB_CartodbfyTable(destschema TEXT, reloid REGCLASS)
@@ -1299,4 +1299,4 @@ BEGIN
 
   RETURN (destschema || '.' || destname)::regclass;
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;

scripts-available/CDB_ColumnNames.sql

@@ -9,7 +9,7 @@ AS $$
     WHERE c.oid = $1::oid
     AND a.attstattarget < 0 -- exclude system columns
    ORDER BY a.attnum;
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL STABLE PARALLEL SAFE;
 
 -- This is to migrate from pre-0.2.0 version
 -- See http://github.com/CartoDB/cartodb-postgresql/issues/36

scripts-available/CDB_ColumnType.sql

@@ -9,7 +9,7 @@ AS $$
   WHERE c.oid = $1::oid
   AND a.attname = $2
   AND a.attstattarget < 0; -- exclude system columns
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL STABLE PARALLEL SAFE;
 
 -- This is to migrate from pre-0.2.0 version
 -- See http://github.com/CartoDB/cartodb-postgresql/issues/36

scripts-available/CDB_Conf.sql

@@ -26,7 +26,7 @@ BEGIN
     PERFORM cartodb.CDB_Conf_RemoveConf(key);
     EXECUTE 'INSERT INTO cartodb.CDB_CONF (KEY, VALUE) VALUES ($1, $2);' USING key, value;
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Conf_RemoveConf(key text)
@@ -34,7 +34,7 @@ FUNCTION cartodb.CDB_Conf_RemoveConf(key text)
 BEGIN
     EXECUTE 'DELETE FROM cartodb.CDB_CONF WHERE KEY = $1;' USING key;
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Conf_GetConf(key text)
@@ -45,4 +45,4 @@ BEGIN
     EXECUTE 'SELECT VALUE FROM cartodb.CDB_CONF WHERE KEY = $1;' INTO value USING key;
     RETURN value;
 END
-$$ LANGUAGE PLPGSQL STABLE;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL SAFE;

scripts-available/CDB_DateToNumber.sql

@@ -12,7 +12,7 @@ BEGIN
 RETURN output;
 END;
 $$
-LANGUAGE 'plpgsql' STABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL UNSAFE;
 
 -- Convert timestamp with time zone to double precision
 --
@@ -28,4 +28,4 @@ BEGIN
 RETURN output;
 END;
 $$
-LANGUAGE 'plpgsql' STABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL UNSAFE;

scripts-available/CDB_DigitSeparator.sql

@@ -50,4 +50,4 @@ BEGIN
 
 END
 $$
-LANGUAGE 'plpgsql' STABLE STRICT;
+LANGUAGE 'plpgsql' STABLE STRICT PARALLEL SAFE;

scripts-available/CDB_DistType.sql

@@ -65,7 +65,7 @@ BEGIN
 
     RETURN signature;
 END;
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE STRICT PARALLEL SAFE;
 
 -- Classify data into AJUSFL
 
@@ -119,4 +119,4 @@ BEGIN
 
     RETURN type;
 END;
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE STRICT PARALLEL SAFE;

scripts-available/CDB_DistinctMeasure.sql

@@ -43,4 +43,4 @@ BEGIN
 
     RETURN passes;
 END;
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE PARALLEL SAFE;

scripts-available/CDB_EqualIntervalBins.sql

@@ -19,6 +19,6 @@ SELECT array_agg(bins)
   FROM (
     SELECT min + generate_series(1,breaks)*del AS bins
       FROM stats) q;
-$$ LANGUAGE SQL IMMUTABLE;
+$$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
 
 DROP FUNCTION IF EXISTS CDB_EqualIntervalBins( numeric[], integer);

scripts-available/CDB_EstimateRowCount.sql

@@ -12,7 +12,7 @@ BEGIN
     EXECUTE Format('ANALYZE %s;', reloid);
   END IF;
 END
-$$ LANGUAGE 'plpgsql' VOLATILE STRICT SECURITY DEFINER;
+$$ LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL RESTRICTED SECURITY DEFINER;
 
 -- Return a row count estimate of the result of a query using statistics
 CREATE OR REPLACE FUNCTION CDB_EstimateRowCount(query text)
@@ -28,4 +28,4 @@ BEGIN
   EXECUTE 'EXPLAIN (FORMAT JSON) ' || query INTO STRICT plan;
   RETURN plan->0->'Plan'->'Plan Rows';
 END
-$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
+$$ LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL RESTRICTED;

scripts-available/CDB_ExtensionUtils.sql

@@ -10,11 +10,11 @@ BEGIN
   sql := 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || '''';
   EXECUTE sql;
 END;
-$$ language 'plpgsql' VOLATILE;
+$$ language 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE FUNCTION cartodb.schema_exists(schema_name text)
 RETURNS boolean AS
 $$
   SELECT EXISTS(SELECT 1 FROM pg_namespace WHERE nspname = schema_name::text);
 $$
-language sql VOLATILE;
+language sql STABLE PARALLEL SAFE;

scripts-available/CDB_ForeignTable.sql

@@ -69,7 +69,7 @@ BEGIN
 
 END
 $$
-LANGUAGE PLPGSQL;
+LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE FUNCTION cartodb._CDB_Setup_FDWS()
 RETURNS VOID AS 
@@ -82,7 +82,7 @@ BEGIN
     END LOOP;
   END
 $$
-LANGUAGE PLPGSQL;
+LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 
 CREATE OR REPLACE FUNCTION cartodb._CDB_Setup_FDW(fdw_name text)
@@ -95,7 +95,7 @@ BEGIN
   EXECUTE 'SELECT cartodb._CDB_Setup_FDW($1, $2)' USING fdw_name, config;
 END
 $BODY$
-LANGUAGE plpgsql VOLATILE;
+LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE FUNCTION cartodb.CDB_Add_Remote_Table(source text, table_name text)
   RETURNS void AS
@@ -107,7 +107,7 @@ BEGIN
   EXECUTE FORMAT ('GRANT SELECT ON %I.%I TO publicuser;', source, table_name);
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE FUNCTION cartodb.CDB_Get_Foreign_Updated_At(foreign_table regclass)
   RETURNS timestamp with time zone AS
@@ -129,7 +129,7 @@ BEGIN
   RETURN time;
 END
 $$
-LANGUAGE plpgsql;
+LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE;
 
 
 CREATE OR REPLACE FUNCTION cartodb._cdb_dbname_of_foreign_table(reloid oid)
@@ -142,7 +142,7 @@ RETURNS TEXT AS $$
         WHERE ft.ftrelid = reloid
 
     )) WHERE option_name='dbname';
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL VOLATILE PARALLEL UNSAFE;
 
 
 -- Return a set of (dbname, schema_name, table_name, updated_at)
@@ -176,7 +176,7 @@ AS $$
             ELSE (SELECT md.updated_at FROM CDB_TableMetadata md WHERE md.tabname = reloid)
       END) AS updated_at
     FROM fqtn;
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL VOLATILE PARALLEL UNSAFE;
 
 
 -- Return the last updated time of a set of tables
@@ -196,4 +196,4 @@ RETURNS timestamptz AS $$
         FROM t_oid
         LEFT JOIN pg_catalog.pg_class c ON c.oid = reloid
     ) SELECT max(updated_at) FROM t_updated_at;
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL VOLATILE PARALLEL UNSAFE;

scripts-available/CDB_GreatCircle.sql

@@ -23,4 +23,4 @@ BEGIN
 RETURN line;
 END;
 $$
-LANGUAGE 'plpgsql';
+LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL SAFE;

scripts-available/CDB_Groups.sql

@@ -15,7 +15,7 @@ BEGIN
     EXECUTE format('CREATE ROLE %I NOLOGIN;', group_role);
     PERFORM cartodb._CDB_Group_CreateGroup_API(group_name, group_role);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Drops group and everything that role owns
 -- TODO: LIMITATION: in order to drop a role all its owned objects must be dropped before.
@@ -33,7 +33,7 @@ BEGIN
     EXECUTE format('DROP ROLE IF EXISTS %I', group_role);
     PERFORM cartodb._CDB_Group_DropGroup_API(group_name);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Renames a group
 CREATE OR REPLACE
@@ -48,7 +48,7 @@ BEGIN
     EXECUTE format('ALTER ROLE %I RENAME TO %I', old_group_role, new_group_role);
     PERFORM cartodb._CDB_Group_RenameGroup_API(old_group_name, new_group_name, new_group_role);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Adds users to a group
 CREATE OR REPLACE
@@ -71,7 +71,7 @@ BEGIN
     end loop;
     PERFORM cartodb._CDB_Group_AddUsers_API(group_name, usernames);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Removes users from a group
 CREATE OR REPLACE
@@ -90,7 +90,7 @@ BEGIN
     end loop;
     PERFORM cartodb._CDB_Group_RemoveUsers_API(group_name, usernames);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 ----------------------------------
 -- TABLE MANAGEMENT FUNCTIONS
@@ -107,7 +107,7 @@ DECLARE
 BEGIN
     PERFORM cartodb._CDB_Group_Table_GrantRead(group_name, username, table_name, true);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_Table_GrantRead(group_name text, username text, table_name text, sync boolean)
@@ -122,7 +122,7 @@ BEGIN
       PERFORM cartodb._CDB_Group_Table_GrantPermission_API(group_name, username, table_name, 'r');
     END IF;
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Grants table write permission to a group
 CREATE OR REPLACE
@@ -133,7 +133,7 @@ DECLARE
 BEGIN
     PERFORM cartodb._CDB_Group_Table_GrantReadWrite(group_name, username, table_name, true);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_Table_GrantReadWrite(group_name text, username text, table_name text, sync boolean)
@@ -149,7 +149,7 @@ BEGIN
       PERFORM cartodb._CDB_Group_Table_GrantPermission_API(group_name, username, table_name, 'w');
     END IF;
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Granting and revoking permissions on sequences
 CREATE OR REPLACE
@@ -175,7 +175,7 @@ BEGIN
     END LOOP;
     RETURN;
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Revokes all permissions on a table from a group
 CREATE OR REPLACE
@@ -186,7 +186,7 @@ DECLARE
 BEGIN
     PERFORM cartodb._CDB_Group_Table_RevokeAll(group_name, username, table_name, true);
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_Table_RevokeAll(group_name text, username text, table_name text, sync boolean)
@@ -201,7 +201,7 @@ BEGIN
       PERFORM cartodb._CDB_Group_Table_RevokeAllPermission_API(group_name, username, table_name);
     END IF;
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -----------------------
 -- Helper functions
@@ -223,7 +223,7 @@ BEGIN
     END IF;
     RETURN group_role;
 END
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL SAFE;
 
 -- Returns the first owner of the schema matching username. Organization user schemas must have one only owner.
 CREATE OR REPLACE
@@ -237,7 +237,7 @@ BEGIN
     SELECT pg_get_userbyid(nspowner) FROM pg_namespace WHERE nspname = username INTO user_role;
     RETURN user_role;
 END
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL SAFE;
 
 -- Database names are too long, we need a shorter version for composing role names
 CREATE OR REPLACE
@@ -249,4 +249,4 @@ BEGIN
     SELECT md5(current_database()) INTO short_database_name;
     RETURN short_database_name;
 END
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL SAFE;

scripts-available/CDB_Groups_API.sql

@@ -22,7 +22,7 @@ $$
     body = '{ "name": "%s", "database_role": "%s" }' % (group_name, group_role)
     query = "select cartodb._CDB_Group_API_Request('POST', '%s', '%s', '{200, 409}') as response_status" % (url, body)
     plpy.execute(query)
-$$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_DropGroup_API(group_name text)
@@ -35,7 +35,7 @@ $$
 
     query = "select cartodb._CDB_Group_API_Request('DELETE', '%s', '', '{204, 404}') as response_status" % url
     plpy.execute(query)
-$$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_RenameGroup_API(old_group_name text, new_group_name text, new_group_role text)
@@ -48,7 +48,7 @@ $$
     body = '{ "name": "%s", "database_role": "%s" }' % (new_group_name, new_group_role)
     query = "select cartodb._CDB_Group_API_Request('PUT', '%s', '%s', '{200, 409}') as response_status" % (url, body)
     plpy.execute(query)
-$$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_AddUsers_API(group_name text, usernames text[])
@@ -74,7 +74,7 @@ $$
     body = "{ \"users\": [\"%s\"] }" % "\",\"".join(usernames)
     query = "select cartodb._CDB_Group_API_Request('DELETE', '%s', '%s', '{200, 404}') as response_status" % (url, body)
     plpy.execute(query)
-$$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 DO LANGUAGE 'plpgsql' $$
 BEGIN
@@ -95,7 +95,7 @@ $$
     body = '{ "access": "%s" }' % access
     query = "select cartodb._CDB_Group_API_Request('PUT', '%s', '%s', '{200, 409}') as response_status" % (url, body)
     plpy.execute(query)
-$$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 DO LANGUAGE 'plpgsql' $$
 BEGIN
@@ -115,7 +115,7 @@ $$
     url = '/api/v1/databases/{0}/groups/%s/permission/%s/tables/%s' % (urllib.pathname2url(group_name), username, table_name)
     query = "select cartodb._CDB_Group_API_Request('DELETE', '%s', '', '{200, 404}') as response_status" % url
     plpy.execute(query)
-$$ LANGUAGE 'plpythonu' VOLATILE SECURITY DEFINER;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 DO LANGUAGE 'plpgsql' $$
 BEGIN
@@ -146,7 +146,7 @@ $$
       params = json.loads(conf)
       auth = 'Basic %s' % plpy.execute("SELECT cartodb._CDB_Group_API_Auth('%s', '%s') as auth" % (params['username'], params['password']))[0]['auth']
       return { "host": params['host'], "port": params['port'], 'timeout': params['timeout'], 'auth': auth }
-$$ LANGUAGE 'plpythonu' VOLATILE;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb._CDB_Group_API_Auth(username text, password text)
@@ -154,7 +154,7 @@ FUNCTION cartodb._CDB_Group_API_Auth(username text, password text)
 $$
     import base64
     return base64.encodestring('%s:%s' % (username, password)).replace('\n', '')
-$$ LANGUAGE 'plpythonu' VOLATILE;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE;
 
 -- url must contain a '%s' placeholder that will be replaced by current_database, for security reasons.
 CREATE OR REPLACE
@@ -191,5 +191,5 @@ $$
       raise last_err
 
     return None
-$$ LANGUAGE 'plpythonu' VOLATILE;
+$$ LANGUAGE 'plpythonu' VOLATILE PARALLEL UNSAFE;
 revoke all on function cartodb._CDB_Group_API_Request(text, text, text, int[]) from public;

scripts-available/CDB_HeadsTailsBins.sql

@@ -43,4 +43,4 @@ BEGIN
     END LOOP; 
     RETURN reply; 
 END; 
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE PARALLEL SAFE;

scripts-available/CDB_Helper.sql

@@ -61,7 +61,7 @@ BEGIN
 
   PERFORM _CDB_Error('looping too far', '_CDB_Unique_Identifier');
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 -- UTF8 safe and length aware. Find a unique identifier for a column with a given prefix
@@ -116,7 +116,7 @@ BEGIN
 
   PERFORM _CDB_Error('looping too far', '_CDB_Unique_Column_Identifier');
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' VOLATILE PARALLEL SAFE;
 
 
 -- Truncates a given string to a max_octets octets taking care
@@ -157,4 +157,4 @@ BEGIN
 
   RETURN left(string, (i - 1));
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE 'plpgsql' IMMUTABLE PARALLEL SAFE;

scripts-available/CDB_Hexagon.sql

@@ -8,7 +8,7 @@ AS $$
       SELECT (ST_DumpPoints(ST_ExteriorRing(ST_Buffer($1, $2, 3)))).*
     ) as points
     WHERE path[1] % 2 != 0
-$$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$$ LANGUAGE 'sql' IMMUTABLE STRICT PARALLEL SAFE;
 
 --
 -- Fill given extent with an hexagonal coverage
@@ -132,4 +132,4 @@ BEGIN
 
   RETURN;
 END
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE 'plpgsql' IMMUTABLE PARALLEL SAFE;

scripts-available/CDB_JenksBins.sql

@@ -117,7 +117,7 @@ BEGIN
 
     RETURN (best_result)[2:array_upper(best_result, 1)];
 END;
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql VOLATILE PARALLEL RESTRICTED;
 
 
 
@@ -217,5 +217,5 @@ BEGIN
     RETURN array_prepend(gvf, reply); 
 
 END; 
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE PARALLEL SAFE;
 

scripts-available/CDB_LatLng.sql

@@ -10,10 +10,10 @@
 CREATE OR REPLACE FUNCTION CDB_LatLng (lat NUMERIC, lng NUMERIC) RETURNS geometry as $$ 
     -- this function is silly
     SELECT ST_SetSRID(ST_MakePoint(lng,lat),4326);
-$$ language SQL IMMUTABLE;
+$$ language SQL IMMUTABLE PARALLEL SAFE;
 
 CREATE OR REPLACE FUNCTION CDB_LatLng (lat FLOAT8, lng FLOAT8) RETURNS geometry as $$ 
     -- this function is silly
     SELECT ST_SetSRID(ST_MakePoint(lng,lat),4326);
-$$ language SQL IMMUTABLE;
+$$ language SQL IMMUTABLE PARALLEL SAFE;
 

scripts-available/CDB_Math.sql

@@ -13,7 +13,7 @@ $BODY$
     ORDER BY COUNT(1) DESC, 1
     LIMIT 1;
 $BODY$
-LANGUAGE 'sql' IMMUTABLE;
+LANGUAGE 'sql' IMMUTABLE PARALLEL SAFE;
 
 DROP AGGREGATE IF EXISTS cartodb.CDB_Math_Mode(anyelement);
 
@@ -21,6 +21,7 @@ CREATE AGGREGATE cartodb.CDB_Math_Mode(anyelement) (
   SFUNC=array_append,
   STYPE=anyarray,
   FINALFUNC=_CDB_Math_final_mode,
+  PARALLEL = SAFE,
   INITCOND='{}'
 );
 

scripts-available/CDB_Organizations.sql

@@ -4,7 +4,7 @@ FUNCTION cartodb.CDB_Organization_Member_Group_Role_Member_Name()
 AS $$
     SELECT 'cdb_org_member'::text || '_' || md5(current_database());
 $$
-LANGUAGE SQL IMMUTABLE;
+LANGUAGE SQL STABLE PARALLEL SAFE;
 
 DO LANGUAGE 'plpgsql' $$
 DECLARE
@@ -25,7 +25,7 @@ AS $$
 BEGIN
     EXECUTE 'GRANT "' || cartodb.CDB_Organization_Member_Group_Role_Member_Name() || '" TO "' || role_name || '"';
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -------------------------------------------------------------------------------
 -- Administrator
@@ -36,7 +36,7 @@ FUNCTION cartodb._CDB_Organization_Admin_Role_Name()
 AS $$
     SELECT current_database() || '_a'::text;
 $$
-LANGUAGE SQL IMMUTABLE;
+LANGUAGE SQL STABLE PARALLEL SAFE;
 
 -- Administrator role creation on extension install
 DO LANGUAGE 'plpgsql' $$
@@ -65,7 +65,7 @@ BEGIN
     -- CREATEROLE is not inherited, and is needed for user creation
     EXECUTE format('ALTER ROLE %I CREATEROLE', cdb_user_role);
 END
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Organization_RemoveAdmin(username text)
@@ -80,7 +80,7 @@ BEGIN
     EXECUTE format('ALTER ROLE %I NOCREATEROLE', cdb_user_role);
     EXECUTE format('REVOKE %I FROM %I', cdb_admin_role, cdb_user_role);
 END
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -------------------------------------------------------------------------------
 -- Sharing tables
@@ -93,7 +93,7 @@ BEGIN
     EXECUTE 'GRANT USAGE ON SCHEMA "' || from_schema || '" TO "' || to_role_name || '"';
     EXECUTE 'GRANT SELECT ON "' || from_schema || '"."' || table_name || '" TO "' || to_role_name || '"';
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Organization_Add_Table_Organization_Read_Permission(from_schema text, table_name text)
@@ -102,7 +102,7 @@ AS $$
 BEGIN
     EXECUTE 'SELECT cartodb.CDB_Organization_Add_Table_Read_Permission(''' || from_schema || ''', ''' || table_name || ''', ''' || cartodb.CDB_Organization_Member_Group_Role_Member_Name() || ''');';
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Organization_Add_Table_Read_Write_Permission(from_schema text, table_name text, to_role_name text)
@@ -112,7 +112,7 @@ BEGIN
     EXECUTE 'GRANT USAGE ON SCHEMA "' || from_schema || '" TO "' || to_role_name || '"';
     EXECUTE 'GRANT SELECT, INSERT, UPDATE, DELETE ON "' || from_schema || '"."' || table_name || '" TO "' || to_role_name || '"';
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Organization_Add_Table_Organization_Read_Write_Permission(from_schema text, table_name text)
@@ -121,7 +121,7 @@ AS $$
 BEGIN
     EXECUTE 'SELECT cartodb.CDB_Organization_Add_Table_Read_Write_Permission(''' || from_schema || ''', ''' || table_name || ''', ''' || cartodb.CDB_Organization_Member_Group_Role_Member_Name() || ''');';
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 
 CREATE OR REPLACE
@@ -134,7 +134,7 @@ BEGIN
     -- We need to revoke usage on schema only if we are revoking privileges from the last table where to_role_name has
     -- any permission granted within the schema from_schema
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Organization_Remove_Organization_Access_Permission(from_schema text, table_name text)
@@ -143,4 +143,4 @@ AS $$
 BEGIN
     EXECUTE 'SELECT cartodb.CDB_Organization_Remove_Access_Permission(''' || from_schema || ''', ''' || table_name || ''', ''' || cartodb.CDB_Organization_Member_Group_Role_Member_Name() || ''');';
 END
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;

scripts-available/CDB_Overviews.sql

@@ -18,7 +18,7 @@ BEGIN
         RAISE NOTICE 'Dropped overview for level %: %', row.z, row.overview_table;
     END LOOP;
 END;
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 
 
@@ -45,7 +45,7 @@ AS $$
       WHERE _CDB_IsOverviewTableOf((SELECT relname FROM pg_class WHERE oid=reloid), table_name)
       ORDER BY z;
   END
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL RESTRICTED;
 
 -- Return existing overviews (if any) for multiple dataset tables.
 -- Scope: public
@@ -69,7 +69,7 @@ AS $$
       schema_name = _cdb_schema_name(base_table)
       AND _CDB_IsOverviewTableOf((SELECT relname FROM pg_class WHERE oid=base_table), table_name)
     ORDER BY base_table, z;
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL STABLE PARALLEL SAFE;
 
 -- Calculate the estimated extent of a cartodbfy'ed table.
 -- Scope: private.
@@ -111,7 +111,7 @@ AS $$
 
     RETURN ext;
   END;
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Determine the max feature density of a given dataset.
 -- Scope: private.
@@ -187,7 +187,7 @@ AS $$
   INTO fd;
   RETURN fd;
   END
-$$ LANGUAGE PLPGSQL STABLE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Experimental default strategy to assign a reference base Z level
 -- to a cartodbfied table. The resulting Z level represents the
@@ -223,7 +223,7 @@ AS $$
     SELECT CDB_XYZ_Resolution(-8) INTO c;
     RETURN least(_CDB_MaxOverviewLevel()+1, ceil(log(2.0, (c*c*fd/lim)::numeric)/2));
   END;
-$$ LANGUAGE PLPGSQL STABLE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Overview table name for a given Z level and base dataset or overview table
 -- Scope: private.
@@ -247,7 +247,7 @@ AS $$
     SELECT _CDB_OverviewBaseTableName(base) INTO base;
     RETURN _CDB_OverviewTableName(base, overview_z);
   END
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Sampling reduction method.
 -- Valid for any kind of geometry.
@@ -310,7 +310,7 @@ AS $$
 
     RETURN Format('%s', overview_table_name)::regclass;
   END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Register new overview table (post-creation chores)
 -- Scope: private
@@ -365,7 +365,7 @@ AS $$
       -- it should be done here (CDB_Overviews would consume such metadata)
     END IF;
   END
-$$ LANGUAGE PLPGSQL SECURITY DEFINER;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 -- Dataset attributes (column names other than the
 -- CartoDB primary key and geometry columns) which should be aggregated
@@ -381,7 +381,7 @@ AS $$
     WHERE c NOT IN (
       cdb.pkey, cdb.geomcol, cdb.mercgeomcol
     )
-$$ LANGUAGE SQL STABLE;
+$$ LANGUAGE SQL STABLE PARALLEL SAFE;
 
 -- List of dataset attributes to be aggregated in aggregated overview
 -- as a comma-separated SQL expression.
@@ -401,7 +401,7 @@ BEGIN
 
   RETURN attr_list;
 END
-$$ LANGUAGE PLPGSQL STABLE;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL SAFE;
 
 -- Check if a column of a table is of an unlimited-length text type
 CREATE OR REPLACE FUNCTION _cdb_unlimited_text_column(reloid REGCLASS, col_name TEXT)
@@ -417,7 +417,7 @@ AS $$
       AND format_type(a.atttypid, NULL) IN ('text', 'character varying', 'character')
       AND format_type(a.atttypid, NULL) = format_type(a.atttypid, a.atttypmod)
   );
-$$ LANGUAGE SQL STABLE;
+$$ LANGUAGE SQL STABLE PARALLEL SAFE;
 
 CREATE OR REPLACE FUNCTION _cdb_categorical_column(reloid REGCLASS, col_name TEXT)
 RETURNS BOOLEAN
@@ -446,7 +446,7 @@ BEGIN
     INTO categorical;
     RETURN categorical;
 END;
-$$ LANGUAGE PLPGSQL VOLATILE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL RESTRICTED;
 
 CREATE OR REPLACE FUNCTION _cdb_mode_of_array(anyarray)
   RETURNS anyelement AS
@@ -457,13 +457,14 @@ $$
     ORDER BY COUNT(1) DESC, 1
     LIMIT 1;
 $$
-LANGUAGE SQL IMMUTABLE;
+LANGUAGE SQL IMMUTABLE PARALLEL SAFE;
 
 DROP AGGREGATE IF EXISTS _cdb_mode(anyelement);
 CREATE AGGREGATE _cdb_mode(anyelement) (
   SFUNC=array_append,
   STYPE=anyarray,
   FINALFUNC=_cdb_mode_of_array,
+  PARALLEL = SAFE,
   INITCOND='{}'
 );
 
@@ -536,7 +537,7 @@ BEGIN
     RETURN 'CASE count(*) WHEN 1 THEN MIN(' || qualified_column || ') ELSE NULL END::' || column_type;
   END CASE;
 END
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL RESTRICTED;
 
 -- List of dataset aggregated attributes as a comma-separated SQL expression.
 -- Scope: private.
@@ -557,7 +558,7 @@ BEGIN
 
   RETURN attr_list;
 END
-$$ LANGUAGE PLPGSQL STABLE;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL RESTRICTED;
 
 -- Array of geometry types detected in a cartodbfied table
 -- For effciency only look at a limited number of rwos.
@@ -579,7 +580,7 @@ BEGIN
   INTO gtypes;
   RETURN gtypes;
 END
-$$ LANGUAGE PLPGSQL STABLE;
+$$ LANGUAGE PLPGSQL STABLE PARALLEL SAFE;
 
 -- Experimental Overview reduction method for point datasets.
 -- It clusters the points using a grid, then aggregates the point in each
@@ -715,7 +716,7 @@ AS $$
 
     RETURN Format('%s', overview_table_name)::regclass;
   END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- This strategy places the aggregation of each cluster at the centroid of the cluster members.
 CREATE OR REPLACE FUNCTION _CDB_GridClusterCentroid_Reduce_Strategy(reloid REGCLASS, ref_z INTEGER, overview_z INTEGER, grid_px FLOAT8 DEFAULT NULL, has_overview_created BOOLEAN DEFAULT FALSE)
@@ -843,7 +844,7 @@ AS $$
 
     RETURN Format('%s', overview_table_name)::regclass;
   END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- This strategy places the aggregation of each cluster at the position of one of the cluster members.
 CREATE OR REPLACE FUNCTION _CDB_GridClusterSample_Reduce_Strategy(reloid REGCLASS, ref_z INTEGER, overview_z INTEGER, grid_px FLOAT8 DEFAULT NULL, has_overview_created BOOLEAN DEFAULT FALSE)
@@ -969,7 +970,7 @@ AS $$
 
     RETURN Format('%s', overview_table_name)::regclass;
   END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Create overview tables for a dataset.
 -- Scope: public
@@ -992,7 +993,7 @@ BEGIN
   tolerance_px := 1.0;
   RETURN CDB_CreateOverviewsWithToleranceInPixels(reloid, tolerance_px, refscale_strategy, reduce_strategy);
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Create overviews with additional parameter to define the desired detail/tolerance in pixels
 CREATE OR REPLACE FUNCTION CDB_CreateOverviewsWithToleranceInPixels(reloid REGCLASS, tolerance_px FLOAT8, refscale_strategy regproc DEFAULT '_CDB_Feature_Density_Ref_Z_Strategy(REGCLASS,FLOAT8)'::regprocedure, reduce_strategy regproc DEFAULT '_CDB_GridCluster_Reduce_Strategy(REGCLASS,INTEGER,INTEGER,FLOAT8,BOOLEAN)'::regprocedure)
@@ -1058,7 +1059,7 @@ BEGIN
 
   RETURN overview_tables;
 END;
-$$ LANGUAGE PLPGSQL;
+$$ LANGUAGE PLPGSQL VOLATILE PARALLEL UNSAFE;
 
 -- Here are some older signatures of these functions, no longer in use.
 -- They must be droped here, after the (new) definition of the function `CDB_CreateOverviews`

scripts-available/CDB_OverviewsSupport.sql

@@ -15,7 +15,7 @@ AS $$
     -- (gridding), so we'll limit Z to a maximum of 31 - 8
     RETURN 23;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Maximum zoom level usable with integer coordinates
 CREATE OR REPLACE FUNCTION _CDB_MaxZoomLevel()
@@ -24,7 +24,7 @@ AS $$
   BEGIN
     RETURN 31;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Information about tables in a schema.
 -- If the schema name parameter is NULL, then tables from all schemas
@@ -46,7 +46,7 @@ AS $$
              THEN n.nspname NOT IN ('pg_catalog', 'information_schema', 'topology', 'cartodb')
            ELSE n.nspname = schema_name
            END;
-$$ LANGUAGE 'sql';
+$$ LANGUAGE 'sql' STABLE PARALLEL SAFE;
 
 -- Pattern that can be used to detect overview tables and Extract
 -- the intended zoom level from the table name.
@@ -57,7 +57,7 @@ AS $$
   BEGIN
     RETURN '\A_vovw_(\d+)_';
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 -- substring(tablename from _CDB_OverviewTableDiscriminator())
 
 
@@ -69,7 +69,7 @@ AS $$
   BEGIN
     RETURN _CDB_OverviewTableDiscriminator() || base_table;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 -- tablename SIMILAR TO _CDB_OverviewTablePattern(base_table)
 
 -- Name of an overview table, given the base table name and the Z level
@@ -80,7 +80,7 @@ AS $$
   BEGIN
     RETURN '_vovw_' || z::text || '_' || base_table;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Condition to check if a tabla is an overview table of some base table
 -- Scope: private.
@@ -90,7 +90,7 @@ AS $$
   BEGIN
     RETURN otable SIMILAR TO _CDB_OverviewTablePattern(base_table);
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Extract the Z level from an overview table name
 -- Scope: private.
@@ -100,7 +100,7 @@ AS $$
   BEGIN
     RETURN substring(otable from _CDB_OverviewTableDiscriminator())::integer;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Name of the base table corresponding to an overview table
 -- Scope: private.
@@ -114,7 +114,7 @@ AS $$
       RETURN regexp_replace(overview_table, _CDB_OverviewTableDiscriminator(), '');
     END IF;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 CREATE OR REPLACE FUNCTION _CDB_OverviewBaseTable(overview_table REGCLASS)
 RETURNS REGCLASS
@@ -134,7 +134,7 @@ AS $$
     END IF;
     RETURN base_table;
   END;
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Schema and relation names of a table given its reloid
 -- Scope: private.
@@ -150,7 +150,7 @@ AS $$
     FROM pg_class c JOIN pg_namespace n ON c.relnamespace = n.oid
     WHERE c.oid = reloid;
   END
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;
 
 -- Schema and relation names of a table given its reloid
 -- Scope: private.
@@ -170,4 +170,4 @@ AS $$
     WHERE c.oid = reloid;
     RETURN schema_name;
   END
-$$ LANGUAGE PLPGSQL IMMUTABLE;
+$$ LANGUAGE PLPGSQL IMMUTABLE PARALLEL SAFE;

scripts-available/CDB_QuantileBins.sql

@@ -40,4 +40,4 @@ BEGIN
     END LOOP;
     RETURN reply;
 END; 
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE STRICT PARALLEL SAFE;

scripts-available/CDB_QueryStatements.sql

@@ -11,4 +11,4 @@ RETURNS SETOF TEXT AS $$
     cleaned = match[0].strip()
     if ( cleaned ):
       yield cleaned
-$$ language 'plpythonu' IMMUTABLE STRICT;
+$$ language 'plpythonu' IMMUTABLE STRICT PARALLEL SAFE;

scripts-available/CDB_QueryTables.sql

@@ -64,7 +64,7 @@ BEGIN
 
   return tables;
 END
-$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
+$$ LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL UNSAFE;
 
 
 -- Keep CDB_QueryTables with same signature for backwards compatibility.
@@ -75,4 +75,4 @@ AS $$
 BEGIN
   RETURN CDB_QueryTablesText(query)::name[];
 END
-$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
+$$ LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL UNSAFE;

scripts-available/CDB_Quota.sql

@@ -12,7 +12,7 @@ BEGIN
   RETURN relation_size;
 END;
 $$
-LANGUAGE 'plpgsql' VOLATILE;
+LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 -- Return the estimated size of user data. Used for quota checking.
 CREATE OR REPLACE FUNCTION CDB_UserDataSize(schema_name TEXT)
@@ -55,7 +55,7 @@ BEGIN
   END IF;
 END;
 $$
-LANGUAGE 'plpgsql' VOLATILE;
+LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 -- Return the estimated size of user data. Used for quota checking.
@@ -63,9 +63,9 @@ LANGUAGE 'plpgsql' VOLATILE;
 CREATE OR REPLACE FUNCTION CDB_UserDataSize()
 RETURNS bigint AS
 $$
-  SELECT public.CDB_UserDataSize('public');
+  SELECT CDB_UserDataSize('public');
 $$
-LANGUAGE 'sql' VOLATILE;
+LANGUAGE 'sql' VOLATILE PARALLEL UNSAFE;
 
 -- Triggers cannot have declared arguments: pbfact float8, qmax int8, schema_name text
 CREATE OR REPLACE FUNCTION CDB_CheckQuota()
@@ -121,7 +121,7 @@ BEGIN
   RETURN NEW;
 END;
 $$
-LANGUAGE 'plpgsql' VOLATILE;
+LANGUAGE 'plpgsql' VOLATILE PARALLEL UNSAFE;
 
 
 CREATE OR REPLACE FUNCTION CDB_SetUserQuotaInBytes(schema_name text, bytes int8)
@@ -142,7 +142,7 @@ BEGIN
   return bytes;
 END
 $$
-LANGUAGE 'plpgsql' VOLATILE STRICT;
+LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL UNSAFE;
 
 
 CREATE OR REPLACE FUNCTION CDB_SetUserQuotaInBytes(bytes int8)
@@ -152,4 +152,4 @@ BEGIN
   return public.CDB_SetUserQuotaInBytes('public', bytes);
 END;
 $$
-LANGUAGE 'plpgsql' VOLATILE STRICT;
+LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL UNSAFE;

scripts-available/CDB_RandomTids.sql

@@ -64,6 +64,6 @@ BEGIN
   RETURN tidlist;
 
 END
-$$ LANGUAGE 'plpgsql' STABLE STRICT;
+$$ LANGUAGE 'plpgsql' STABLE STRICT PARALLEL SAFE;
 -- }
 

scripts-available/CDB_RectangleGrid.sql

@@ -6,7 +6,7 @@
 --            be emitted. The returned hexagons will have the same SRID
 --            as this extent.
 --
--- @param width With of each rectangle
+-- @param width Width of each rectangle
 --
 -- @param height Height of each rectangle
 --
@@ -93,4 +93,4 @@ BEGIN
 
   RETURN;
 END
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE 'plpgsql' IMMUTABLE PARALLEL SAFE;

scripts-available/CDB_Stats.sql

@@ -29,7 +29,7 @@ BEGIN
       RETURN k;
     END IF;
 END;
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE STRICT PARALLEL SAFE;
 
 -- Calculate skewness
 CREATE OR REPLACE FUNCTION CDB_Skewness ( in_array NUMERIC[] ) RETURNS NUMERIC as $$
@@ -50,4 +50,4 @@ BEGIN
       RETURN sk;
     END IF;
 END;
-$$ language plpgsql IMMUTABLE;
+$$ language plpgsql IMMUTABLE STRICT PARALLEL SAFE;

scripts-available/CDB_StringToDate.sql

@@ -17,4 +17,4 @@ BEGIN
 RETURN output;
 END;
 $$
-LANGUAGE 'plpgsql' STABLE STRICT;
+LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL UNSAFE;

scripts-available/CDB_TableIndexes.sql

@@ -20,7 +20,7 @@ AS $$
   AND pg_class.relname=pg_indexes.indexname
   ;
 
-$$ LANGUAGE SQL;
+$$ LANGUAGE SQL STABLE PARALLEL SAFE;
 
 -- This is to migrate from pre-0.2.0 version
 -- See http://github.com/CartoDB/cartodb-postgresql/issues/36

scripts-available/CDB_TableMetadata.sql

@@ -56,7 +56,7 @@ BEGIN
   RETURN NULL;
 END;
 $$
-LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 --
 -- Trigger invalidating varnish whenever CDB_TableMetadata
@@ -117,7 +117,7 @@ BEGIN
   RETURN NULL;
 END;
 $$
-LANGUAGE plpgsql VOLATILE SECURITY DEFINER;
+LANGUAGE plpgsql VOLATILE PARALLEL UNSAFE SECURITY DEFINER;
 
 DROP TRIGGER IF EXISTS table_modified ON public.CDB_TableMetadata;
 -- NOTE: on DELETE we would be unable to convert the table
@@ -143,4 +143,4 @@ CREATE OR REPLACE FUNCTION public.CDB_TableMetadataTouch(tablename regclass)
             WHERE NOT EXISTS (SELECT * FROM upsert);
     END;
     $$
-LANGUAGE 'plpgsql' VOLATILE STRICT;
+LANGUAGE 'plpgsql' VOLATILE STRICT PARALLEL UNSAFE;

scripts-available/CDB_TransformToWebmercator.sql

@@ -53,7 +53,7 @@ BEGIN
       WHEN OTHERS THEN
         -- See http://github.com/Vizzuality/cartodb/issues/931
         RAISE WARNING 'Could not clean input geometry: %', SQLERRM;
-        RETURN NULL; 
+        RETURN NULL;
     END;
     latlon_input := ST_CollectionExtract(latlon_input, ST_Dimension(geom)+1);
   END IF;
@@ -75,4 +75,4 @@ BEGIN
 
   RETURN ret;
 END
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL UNSAFE;

scripts-available/CDB_UserTables.sql

@@ -21,7 +21,7 @@ AND CASE WHEN perm = 'public' THEN has_table_privilege('publicuser', c.oid, 'SEL
          WHEN perm = 'all' THEN has_table_privilege(current_user, c.oid, 'SELECT') OR has_table_privilege('publicuser', c.oid, 'SELECT')
          ELSE false END;
 
-$$ LANGUAGE 'sql';
+$$ LANGUAGE 'sql' STABLE PARALLEL SAFE;
 
 -- This is to migrate from pre-0.2.0 version
 -- See http://github.com/CartoDB/cartodb-postgresql/issues/36

scripts-available/CDB_XYZ.sql

@@ -1,4 +1,3 @@
-
 -- {
 -- Return pixel resolution at the given zoom level
 -- }{
@@ -7,7 +6,7 @@ RETURNS FLOAT8
 AS $$
   -- circumference divided by 256 is z0 resolution, then divide by 2^z
   SELECT 6378137.0*2.0*pi() / 256.0 / power(2.0, z);
-$$ LANGUAGE SQL IMMUTABLE STRICT;
+$$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE STRICT;
 -- }
 
 -- {
@@ -58,7 +57,6 @@ BEGIN
   --RAISE DEBUG 'ymax: %', ymax;
   
   RETURN ST_MakeEnvelope(xmin, ymin, xmax, ymax, 3857);
-
 END
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT PARALLEL SAFE;
 -- }

scripts-available/CDB_ZoomFromScale.sql

@@ -2,7 +2,7 @@
 CREATE OR REPLACE FUNCTION _CDB_MaxSupportedZoom()
 RETURNS int
 LANGUAGE SQL
-IMMUTABLE
+IMMUTABLE PARALLEL SAFE
 AS $$
   -- The maximum zoom level has to be limited for various reasons,
   -- e.g. zoom levels greater than 31 would require tile coordinates
@@ -15,7 +15,7 @@ $$;
 CREATE OR REPLACE FUNCTION cartodb.CDB_ZoomFromScale(scaleDenominator numeric)
 RETURNS int
 LANGUAGE SQL
-IMMUTABLE
+IMMUTABLE PARALLEL SAFE
 AS $$
   SELECT
     CASE

test/CDB_QuotaTest.sql

@@ -1,5 +1,5 @@
 set client_min_messages to error;
-\set VERBOSITY default
+\set VERBOSITY TERSE
 
 -- See the dice
 SELECT setseed(0.5);

test/extension/run_at_cartodb_schema.sql

@@ -1,7 +0,0 @@
-SET SCHEMA 'cartodb';
-\i scripts-available/CDB_Quota.sql
-\i scripts-available/CDB_TableMetadata.sql
-\i scripts-available/CDB_ColumnNames.sql
-\i scripts-available/CDB_ColumnType.sql
-\i scripts-available/CDB_AnalysisCatalog.sql
-SET SCHEMA 'public';

test/extension/test.sh

@@ -12,6 +12,8 @@
 DATABASE=test_extension
 CMD='echo psql'
 CMD=psql
+SED=sed
+PG_PARALLEL=$(pg_config --version | awk '{$2*=1000; if ($2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0)
 
 OK=0
 PARTIALOK=0
@@ -26,6 +28,30 @@ function clear_partial_result() {
     PARTIALOK=0
 }
 
+function load_sql_file() {
+    if [[ $PG_PARALLEL -eq 0 ]]
+    then
+        tmp_file=/tmp/$(basename $1)_no_parallel
+        ${SED} $1 -e 's/PARALLEL \= [A-Z]*/''/g' -e 's/PARALLEL [A-Z]*/''/g' > $tmp_file
+        ${CMD} -d ${DATABASE} -f $tmp_file
+        rm $tmp_file
+    else
+        ${CMD} -d ${DATABASE} -f $1
+    fi
+}
+
+function load_sql_file_schema() {
+    if [[ $PG_PARALLEL -eq 0 ]]
+    then
+        tmp_file=/tmp/$(basename $1)_no_parallel
+        ${SED} $1 -e 's/PARALLEL \= [A-Z]*/''/g' -e 's/PARALLEL [A-Z]*/''/g' > $tmp_file
+        PGOPTIONS="$PGOPTIONS --search_path=\"$2\"" ${CMD} -d ${DATABASE} -f $tmp_file
+        rm $tmp_file
+    else
+        PGOPTIONS="$PGOPTIONS --search_path=\"$2\"" ${CMD} -d ${DATABASE} -f $1
+    fi
+}
+
 
 function sql() {
     local ROLE
@@ -180,11 +206,15 @@ function setup_database() {
     sql "CREATE EXTENSION plpythonu;"
 
     log_info "########################### BOOTSTRAP ###########################"
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_Organizations.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_OverviewsSupport.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_AnalysisSupport.sql
-    # trick to allow forcing a schema when loading SQL files (see: http://bit.ly/1HeLnhL)
-    ${CMD} -d ${DATABASE} -f test/extension/run_at_cartodb_schema.sql
+    load_sql_file scripts-available/CDB_Organizations.sql
+    load_sql_file scripts-available/CDB_OverviewsSupport.sql
+    load_sql_file scripts-available/CDB_AnalysisSupport.sql
+
+    load_sql_file_schema scripts-available/CDB_Quota.sql cartodb
+    load_sql_file_schema scripts-available/CDB_TableMetadata.sql cartodb
+    load_sql_file_schema scripts-available/CDB_ColumnNames.sql cartodb
+    load_sql_file_schema scripts-available/CDB_ColumnType.sql cartodb
+    load_sql_file_schema scripts-available/CDB_AnalysisCatalog.sql cartodb
 }
 
 function setup() {
@@ -423,8 +453,8 @@ function test_cdb_column_type() {
 }
 
 function test_cdb_querytables_schema_and_table_names_with_dots() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
 
     sql postgres 'CREATE SCHEMA "foo.bar";'
     sql postgres 'CREATE TABLE "foo.bar"."c.a.r.t.o.d.b" (a int);'
@@ -439,8 +469,8 @@ function test_cdb_querytables_schema_and_table_names_with_dots() {
 }
 
 function test_cdb_querytables_table_name_with_dots() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
 
     sql postgres 'CREATE TABLE "w.a.d.u.s" (a int);';
 
@@ -451,8 +481,8 @@ function test_cdb_querytables_table_name_with_dots() {
 }
 
 function test_cdb_querytables_happy_cases() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
 
     sql postgres 'CREATE TABLE wadus (a int);';
     sql postgres 'CREATE TABLE "FOOBAR" (a int);';
@@ -475,17 +505,17 @@ function test_cdb_querytables_happy_cases() {
 }
 
 function test_foreign_tables() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_TableMetadata.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_Conf.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_ForeignTable.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_TableMetadata.sql
+    load_sql_file scripts-available/CDB_Conf.sql
+    load_sql_file scripts-available/CDB_ForeignTable.sql
 
 
     DATABASE=fdw_target setup_database
-    ${CMD} -d fdw_target -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d fdw_target -f scripts-available/CDB_QueryTables.sql
-    ${CMD} -d fdw_target -f scripts-available/CDB_TableMetadata.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_TableMetadata.sql
 
     DATABASE=fdw_target sql postgres "DO
 \$\$

test/organization/test.sh

@@ -8,8 +8,9 @@
 #
 
 DATABASE=test_organizations
-CMD='echo psql'
 CMD=psql
+SED=sed
+PG_PARALLEL=$(pg_config --version | awk '{$2*=1000; if ($2 >= 9600) print 1; else print 0;}' 2> /dev/null || echo 0)
 
 OK=0
 PARTIALOK=0
@@ -24,6 +25,18 @@ function clear_partial_result() {
     PARTIALOK=0
 }
 
+function load_sql_file() {
+    if [[ $PG_PARALLEL -eq 0 ]]
+    then
+        tmp_file=/tmp/$(basename $1)_no_parallel
+        ${SED} $1 -e 's/PARALLEL \= [A-Z]*/''/g' -e 's/PARALLEL [A-Z]*/''/g' > $tmp_file
+        ${CMD} -d ${DATABASE} -f $tmp_file
+        rm $tmp_file
+    else
+        ${CMD} -d ${DATABASE} -f $1
+    fi
+}
+
 
 function sql() {
     local ROLE
@@ -163,10 +176,10 @@ function setup() {
     sql "GRANT USAGE ON SCHEMA cartodb TO public;"
 
     log_info "########################### BOOTSTRAP ###########################"
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_Organizations.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_Conf.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_Groups.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_Groups_API.sql
+    load_sql_file scripts-available/CDB_Organizations.sql
+    load_sql_file scripts-available/CDB_Conf.sql
+    load_sql_file scripts-available/CDB_Groups.sql
+    load_sql_file scripts-available/CDB_Groups_API.sql
 
     log_info "############################# SETUP #############################"
     create_role_and_schema cdb_org_admin
@@ -380,20 +393,20 @@ function test_user_can_read_when_it_has_permission_after_organization_permission
 }
 
 function test_cdb_querytables_returns_schema_and_table_name() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
     sql cdb_testmember_1 "select * from CDB_QueryTables('select * from foo');" should "{cdb_testmember_1.foo}"
 }
 
 function test_cdb_querytables_returns_schema_and_table_name_for_several_schemas() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
     sql postgres "select * from CDB_QueryTables('select * from cdb_testmember_1.foo, cdb_testmember_2.bar');" should "{cdb_testmember_1.foo,cdb_testmember_2.bar}"
 }
 
 function test_cdb_querytables_does_not_return_functions_as_part_of_the_resultset() {
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryStatements.sql
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_QueryTables.sql
+    load_sql_file scripts-available/CDB_QueryStatements.sql
+    load_sql_file scripts-available/CDB_QueryTables.sql
     sql postgres "select * from CDB_QueryTables('select * from cdb_testmember_1.foo, cdb_testmember_2.bar, plainto_tsquery(''foo'')');" should "{cdb_testmember_1.foo,cdb_testmember_2.bar}"
 }
 
@@ -419,7 +432,7 @@ function test_cdb_usertables_should_work_with_orgusers() {
 
 
     # test CDB_UserTables with publicuser
-    ${CMD} -d ${DATABASE} -f scripts-available/CDB_UserTables.sql
+    load_sql_file scripts-available/CDB_UserTables.sql
 
     sql publicuser "SELECT count(*) FROM CDB_UserTables('all')" should 1
     sql publicuser "SELECT count(*) FROM CDB_UserTables('public')" should 1