Fix sql issues

nathanbraun · Apr 14, 2023 · 3bd89db · 3bd89db
1 parent a5d6d68
commit 3bd89db
Show file tree

Hide file tree

Showing 8 changed files with 3,373 additions and 2,905 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,9 @@ If I were using Windows, it might look like this:
 Set these aside for now and we'll pick them up in chapter 2.
 
 ## Changelog
+### v0.0.7 (2023-04-14)
+Fixed end of chapter sql problems (you're the man Emil!).
+
 ### v0.0.6 (2023-03-23)
 Fix some misc typos, mostly in end of chapter problems (thanks again Emil!).
 

diff --git a/code/04_sql.py b/code/04_sql.py
@@ -65,7 +65,7 @@
     """
     SELECT player_id, name, nationality, pos, team
     FROM player
-    WHERE team = 'CHI' AND pos == 'LW'
+    WHERE team = 'CHI' AND pos = 'LW'
     """, conn)
 df.head()
 
@@ -74,7 +74,7 @@
     """
     SELECT player_id, name, nationality, pos, team
     FROM player
-    WHERE team = 'BOS' OR pos == 'LW'
+    WHERE team = 'BOS' OR pos = 'LW'
     """, conn)
 df.head()
 

diff --git a/data/problems/combine2/c.csv b/data/problems/combine2/c.csv
diff --git a/data/problems/combine2/d.csv b/data/problems/combine2/d.csv
diff --git a/data/problems/combine2/lw.csv b/data/problems/combine2/lw.csv
diff --git a/data/problems/combine2/rw.csv b/data/problems/combine2/rw.csv
diff --git a/solutions-to-exercises/03_pandas_answers.py b/solutions-to-exercises/03_pandas_answers.py
@@ -342,19 +342,22 @@
 df_fo = pd.read_csv(path.join(DATA_DIR, 'problems/combine1', 'fo.csv'))
 df_poss = pd.read_csv(path.join(DATA_DIR, 'problems/combine1', 'poss.csv'))
 df_shot = pd.read_csv(path.join(DATA_DIR, 'problems/combine1', 'shot.csv'))
+df_hit = pd.read_csv(path.join(DATA_DIR, 'problems/combine1', 'hit.csv'))
 
 # b
 df_comb1 = pd.merge(df_name, df_fo, how='left')
 df_comb1 = pd.merge(df_comb1, df_poss, how='left')
 df_comb1 = pd.merge(df_comb1, df_shot, how='left')
+df_comb1 = pd.merge(df_comb1, df_hit, how='left')
 
 df_comb1 = df_comb1.fillna(0)
 
 # c
 df_comb2 = pd.concat([df_name.set_index(['player_id', 'game_id']),
                       df_fo.set_index(['player_id', 'game_id']),
                       df_poss.set_index(['player_id', 'game_id']),
-                      df_shot.set_index(['player_id', 'game_id'])], join='outer',
+                      df_shot.set_index(['player_id', 'game_id']),
+                      df_hit.set_index(['player_id', 'game_id'])], join='outer',
                      axis=1)
 
 df_comb2 = df_comb2.fillna(0)

diff --git a/solutions-to-exercises/04_sql_answers.py b/solutions-to-exercises/04_sql_answers.py
@@ -39,6 +39,6 @@
         player AS p
     WHERE
         t.team = pg.team AND
-        t.division = 'Central' AND
+        team.division = 'Atlantic' AND
         p.player_id = pg.player_id
     """, conn)