From 5f03959bfe785f6e9837b6dfc982067be251548f Mon Sep 17 00:00:00 2001 From: emkael Date: Sun, 21 Jan 2024 18:35:35 +0100 Subject: Paid fee check update for new calendar year --- .envrc | Bin 1109 -> 1110 bytes dumps/.paid-queries | 14 +++++++------- dumps/check-paid.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.envrc b/.envrc index 7f6655b..8e6ab2b 100644 Binary files a/.envrc and b/.envrc differ diff --git a/dumps/.paid-queries b/dumps/.paid-queries index 0db9821..564edbf 100644 --- a/dumps/.paid-queries +++ b/dumps/.paid-queries @@ -1,7 +1,7 @@ -dmp202324_1n 1 5 -dmp202324_1s 1 5 -dmp202324_2ne 1 5 -dmp202324_2se 1 5 -dmp202324_2nw 1 5 -dmp202324_2sw 1 5 -dmp202324_e 1 7 +dmp202324_1n 11 15 +dmp202324_1s 11 15 +dmp202324_2ne 11 15 +dmp202324_2se 11 15 +dmp202324_2nw 11 15 +dmp202324_2sw 11 15 +dmp202324_e 8 15 diff --git a/dumps/check-paid.sh b/dumps/check-paid.sh index 3cf1244..68ea146 100755 --- a/dumps/check-paid.sh +++ b/dumps/check-paid.sh @@ -4,5 +4,5 @@ PLAYERSDB=${LIGA_PLAYERS_DB_NAME} ROUNDFROM=$2 ROUNDTO=$3 echo $DBNAME -QUERY="SELECT dmpplayers.link, CONCAT(dmpplayers.gname, ' ', dmpplayers.sname), teams.fullname, CONCAT(segments.rnd, '-', segments.segment), players.flag1, players.flag2 FROM $DBNAME.butler butler JOIN $DBNAME.players dmpplayers ON dmpplayers.id = butler.id LEFT JOIN $PLAYERSDB.players players ON players.id = dmpplayers.link JOIN $DBNAME.teams teams ON teams.id = dmpplayers.team JOIN (SELECT rnd, segment, openN as pl FROM $DBNAME.segments UNION SELECT rnd, segment, openE as pl FROM $DBNAME.segments UNION SELECT rnd, segment, openW as pl FROM $DBNAME.segments UNION SELECT rnd, segment, openS as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeN as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeE as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeW as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeS as pl FROM $DBNAME.segments) segments ON segments.pl = dmpplayers.id WHERE (COALESCE(players.flag2, 'N') <> 'T' AND COALESCE(players.flag1, 'N') <> 'T') AND segments.rnd >= $ROUNDFROM AND segments.rnd <= $ROUNDTO ORDER BY dmpplayers.link, segments.rnd, segments.segment;" +QUERY="SELECT dmpplayers.link, CONCAT(dmpplayers.gname, ' ', dmpplayers.sname), teams.fullname, CONCAT(segments.rnd, '-', segments.segment), players.flag1, players.flag2 FROM $DBNAME.butler butler JOIN $DBNAME.players dmpplayers ON dmpplayers.id = butler.id LEFT JOIN $PLAYERSDB.players players ON players.id = dmpplayers.link JOIN $DBNAME.teams teams ON teams.id = dmpplayers.team JOIN (SELECT rnd, segment, openN as pl FROM $DBNAME.segments UNION SELECT rnd, segment, openE as pl FROM $DBNAME.segments UNION SELECT rnd, segment, openW as pl FROM $DBNAME.segments UNION SELECT rnd, segment, openS as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeN as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeE as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeW as pl FROM $DBNAME.segments UNION SELECT rnd, segment, closeS as pl FROM $DBNAME.segments) segments ON segments.pl = dmpplayers.id WHERE (COALESCE(players.flag2, 'N') <> 'T') AND segments.rnd >= $ROUNDFROM AND segments.rnd <= $ROUNDTO ORDER BY dmpplayers.link, segments.rnd, segments.segment;" echo $QUERY | mysql ${LIGA_MYSQL_CONNECTION_OPTS} -N -- cgit v1.2.3