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

Fix regex for PARALLEL aggregations

Browse Source 
Worked in pg10, but it didn't in pg9.5
This commit is contained in:
Raul Marin 2017-10-25 17:58:10 +02:00 committed by Raúl Marín
parent 0f7a1c4882
commit 72c214a8e4
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -123,7 +123,7 @@ $(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
cat cartodb_version.sql >> $@ cat cartodb_version.sql >> $@
ifeq ($(PG_PARALLEL), 0) ifeq ($(PG_PARALLEL), 0)
# Remove PARALLEL in aggregates and functions # Remove PARALLEL in aggregates and functions
$(SED) -e 's/PARALLEL \= [A-Z]*/''/g' \ $(SED) -e 's/PARALLEL \= [A-Z]*,/''/g' \
-e 's/PARALLEL [A-Z]*/''/g' -i $@ -e 's/PARALLEL [A-Z]*/''/g' -i $@
endif endif

4
scripts-available/CDB_Math.sql
View File

@ -21,7 +21,7 @@ CREATE AGGREGATE cartodb.CDB_Math_Mode(anyelement) (
SFUNC=array_append, SFUNC=array_append,
STYPE=anyarray, STYPE=anyarray,
FINALFUNC=_CDB_Math_final_mode, FINALFUNC=_CDB_Math_final_mode,
INITCOND='{}', PARALLEL = SAFE,
PARALLEL = SAFE INITCOND='{}'
); );

4
scripts-available/CDB_Overviews.sql
View File

@ -464,8 +464,8 @@ CREATE AGGREGATE _cdb_mode(anyelement) (
SFUNC=array_append, SFUNC=array_append,
STYPE=anyarray, STYPE=anyarray,
FINALFUNC=_cdb_mode_of_array, FINALFUNC=_cdb_mode_of_array,
INITCOND='{}', PARALLEL = SAFE,
PARALLEL = SAFE INITCOND='{}'
); );
-- SQL Aggregation expression for a datase attribute -- SQL Aggregation expression for a datase attribute