diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-06-23 13:05:17 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-06-23 13:05:17 +0200 |
| commit | 9b909b3ae7c74a828da60e5bf546b5feac1d0750 (patch) | |
| tree | 0f74f268564002d03876b31034b43253b05c3350 | |
| parent | 89063de364af6bc529e1d72690ccade5aa5e2f0d (diff) | |
| download | cruncher-9b909b3ae7c74a828da60e5bf546b5feac1d0750.tar.gz cruncher-9b909b3ae7c74a828da60e5bf546b5feac1d0750.zip | |
fix sequelize having issues with :digit:
| -rw-r--r-- | crunch_global.sql | 12 | ||||
| -rw-r--r-- | worker.js | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/crunch_global.sql b/crunch_global.sql index 30b31b2..537adae 100644 --- a/crunch_global.sql +++ b/crunch_global.sql @@ -54,12 +54,12 @@ JOIN `build` ON `build`.`name` = 'all' OR ( `series`.`show_in_web` = TRUE AND `filter`.`name` = 'all' AND - `build`.`item_1` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT('^([[:digit:]]+;[[:digit:]]+,)*(', `build`.`item_1`, ';', `build`.`item_1_count`, ')+(,[[:digit:]]+;[[:digit:]]+)*$') AND - `build`.`item_2` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT('^([[:digit:]]+;[[:digit:]]+,)*(', `build`.`item_2`, ';', `build`.`item_2_count`, ')+(,[[:digit:]]+;[[:digit:]]+)*$') AND - `build`.`item_3` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT('^([[:digit:]]+;[[:digit:]]+,)*(', `build`.`item_3`, ';', `build`.`item_3_count`, ')+(,[[:digit:]]+;[[:digit:]]+)*$') AND - `build`.`item_4` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT('^([[:digit:]]+;[[:digit:]]+,)*(', `build`.`item_4`, ';', `build`.`item_4_count`, ')+(,[[:digit:]]+;[[:digit:]]+)*$') AND - `build`.`item_5` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT('^([[:digit:]]+;[[:digit:]]+,)*(', `build`.`item_5`, ';', `build`.`item_5_count`, ')+(,[[:digit:]]+;[[:digit:]]+)*$') AND - `build`.`item_6` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT('^([[:digit:]]+;[[:digit:]]+,)*(', `build`.`item_6`, ';', `build`.`item_6_count`, ')+(,[[:digit:]]+;[[:digit:]]+)*$') + `build`.`item_1` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT(:build_regex_start, `build`.`item_1`, ';', `build`.`item_1_count`, :build_regex_end) AND + `build`.`item_2` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT(:build_regex_start, `build`.`item_2`, ';', `build`.`item_2_count`, :build_regex_end) AND + `build`.`item_3` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT(:build_regex_start, `build`.`item_3`, ';', `build`.`item_3_count`, :build_regex_end) AND + `build`.`item_4` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT(:build_regex_start, `build`.`item_4`, ';', `build`.`item_4_count`, :build_regex_end) AND + `build`.`item_5` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT(:build_regex_start, `build`.`item_5`, ';', `build`.`item_5_count`, :build_regex_end) AND + `build`.`item_6` IS NOT NULL OR `participant_stats`.`item_grants` RLIKE CONCAT(:build_regex_start, `build`.`item_6`, ';', `build`.`item_6_count`, :build_regex_end) ) -- counters @@ -119,6 +119,8 @@ if (LOGGLY_TOKEN) if (api_ids_global.length > 0) await seq.query(global_script, { replacements: { + build_regex_start: '^([[:digit:]]+;[[:digit:]]+,)*(', + build_regex_end: ')+(,[[:digit:]]+;[[:digit:]]+)*$', participant_api_ids: api_ids_global }, type: seq.QueryTypes.UPSERT |