Fix regex for PARALLEL aggregations

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

Makefile

@@ -123,7 +123,7 @@ $(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile
 	cat cartodb_version.sql >> $@
 ifeq ($(PG_PARALLEL), 0)
 # 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 $@
 endif
 

scripts-available/CDB_Math.sql

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

scripts-available/CDB_Overviews.sql

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