3cb-data

commit 15ff5b93570fa99173a21ce93ef33ecb3163dbc6
parent 2bf2425d5e4365e1e4eb9f0e6619ad86183246c6
Author: alex wennerberg <alex@alexwennerberg.com>
Date:   Mon, 12 Feb 2024 00:11:28 -0500

update data export

Diffstat:
M
getdata.py
 | 
1
-
M
sql/new.sql
 | 
24
+++++++++++++++++-------

2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/getdata.py b/getdata.py
@@ -91,7 +91,6 @@ def save_sheet(cur, sheet, n, final):
         if len(row) < 3:
             continue
         group = row[0].partition(" ")[2]
-        print(row)
         if final:
             group = "final"
         try:
diff --git a/sql/new.sql b/sql/new.sql
@@ -1,18 +1,28 @@
 /* awkward and repetitive bc my sql is bad */
-
 select 'New cards this round:';
-with new as (
-select min(card.round) as rnd, group_name = 'final' as isfinal, name
+
+with card as (
+select round,player,card1 as card from deck
+union select round,player,card2 as card from deck
+union select round,player,card3 as card from deck),
+
+new as (
+select min(card.round) as rnd, group_name = 'final' as isfinal, card
 from match join card on match.round = card.round and match.player = card.player
 group by 2,3 order by 1,2)
 
-select name from new where rnd = (select max(rnd) from new) and not isfinal;
+select card from new where rnd = (select max(rnd) from new) and not isfinal;
 select '';
 select 'Cards that made finals for the first time:';
-with new as (
-select min(card.round) as rnd, group_name = 'final' as isfinal, name
+with card as (
+select round,player,card1 as card from deck
+union select round,player,card2 as card from deck
+union select round,player,card3 as card from deck),
+
+new as (
+select min(card.round) as rnd, group_name = 'final' as isfinal, card
 from match join card on match.round = card.round and match.player = card.player
 group by 2,3 order by 1,2)
-select name from new where rnd = (select max(rnd) from new) and isfinal;
+select card from new where rnd = (select max(rnd) from new) and isfinal;