diff --git a/02_activities/assignments/Assignment1.md b/02_activities/assignments/Assignment1.md
index bd4ec5981..38009d254 100644
--- a/02_activities/assignments/Assignment1.md
+++ b/02_activities/assignments/Assignment1.md
@@ -106,6 +106,9 @@ Please do not pick the exact same tables that I have already diagrammed. For exa
-
- The column names can be found in a few spots (DB Schema window in the bottom right, the Database Structure tab in the main window by expanding each table entry, at the top of the Browse Data tab in the main window)
+##### My Logical Data Model
+
+
***
## Section 2:
@@ -205,5 +208,11 @@ Consider, for example, concepts of fariness, inequality, social structures, marg
```
-Your thoughts...
+The assigned article discusses how databases that embed societal value systems and social constructs profoundly perpetuate inequality and marginalization.
+For the example of Pakistan's NADRA system, we observe a reflection and reinforcement of hierarchical/patriarchal power dynamics, where a government-official
+marriage between a man and a woman determines their children's access to essential services. In our daily lives, facial recognition technologies, trained on
+deeply human-biased databases that are categorized inherently with deep, implicit biases, amplify societal discrimination of racialized individuals, and
+this is further demonstrated through the use of these technologies in policing. In addition, an attempt to operationalize gender as a boolean, as Pakistan's
+NADRA system has done until 2009 not only dismisses the existence of non-binary gender identities but also overlooks how gender is inherently a social
+construct shaped by value systems that, in turn, lead to differential socialization.
```
diff --git a/02_activities/assignments/assignment1.sql b/02_activities/assignments/assignment1.sql
index 2e89fa7af..c421df9da 100644
--- a/02_activities/assignments/assignment1.sql
+++ b/02_activities/assignments/assignment1.sql
@@ -4,21 +4,29 @@
--SELECT
/* 1. Write a query that returns everything in the customer table. */
-
+SELECT * FROM customer;
/* 2. Write a query that displays all of the columns and 10 rows from the cus- tomer table,
sorted by customer_last_name, then customer_first_ name. */
-
+SELECT *
+FROM customer
+ORDER BY customer_last_name ASC, customer_first_name
+LIMIT 10;
--WHERE
/* 1. Write a query that returns all customer purchases of product IDs 4 and 9. */
-- option 1
-
+SELECT *
+FROM customer_purchases
+WHERE product_id IN (4, 9);
-- option 2
-
+SELECT *
+FROM customer_purchases
+WHERE product_id = 4
+OR product_id = 9;
/*2. Write a query that returns all customer purchases and a new calculated column 'price' (quantity * cost_to_customer_per_qty),
@@ -27,10 +35,16 @@ filtered by vendor IDs between 8 and 10 (inclusive) using either:
2. one condition using BETWEEN
*/
-- option 1
-
+SELECT cp.*,
+quantity*cost_to_customer_per_qty AS price
+FROM customer_purchases AS cp
+WHERE vendor_id > 7 AND vendor_id < 11;
-- option 2
-
+SELECT cp.*,
+quantity*cost_to_customer_per_qty AS price
+FROM customer_purchases AS cp
+WHERE vendor_id BETWEEN 8 AND 10;
--CASE
@@ -38,18 +52,37 @@ filtered by vendor IDs between 8 and 10 (inclusive) using either:
Using the product table, write a query that outputs the product_id and product_name
columns and add a column called prod_qty_type_condensed that displays the word “unit”
if the product_qty_type is “unit,” and otherwise displays the word “bulk.” */
-
+SELECT product_id, product_name
+,CASE WHEN product_qty_type = "unit"
+ THEN "unit"
+ ELSE "bulk"
+ END AS prod_qty_type_condensed
+FROM product;
/* 2. We want to flag all of the different types of pepper products that are sold at the market.
add a column to the previous query called pepper_flag that outputs a 1 if the product_name
contains the word “pepper” (regardless of capitalization), and otherwise outputs 0. */
-
+SELECT product_id, product_name
+,CASE WHEN product_qty_type = "unit"
+ THEN "unit"
+ ELSE "bulk"
+ END AS prod_qty_type_condensed
+, CASE WHEN product_name LIKE "%pepper%"
+ THEN 1
+ ELSE 0
+ END AS pepper_flag
+FROM product;
--JOIN
/* 1. Write a query that INNER JOINs the vendor table to the vendor_booth_assignments table on the
vendor_id field they both have in common, and sorts the result by vendor_name, then market_date. */
+SELECT *
+FROM vendor_booth_assignments AS vba
+INNER JOIN vendor AS v
+ ON vba.vendor_id = v.vendor_id
+ORDER BY v.vendor_name ASC, vba.market_date;
@@ -59,7 +92,11 @@ vendor_id field they both have in common, and sorts the result by vendor_name, t
-- AGGREGATE
/* 1. Write a query that determines how many times each vendor has rented a booth
at the farmer’s market by counting the vendor booth assignments per vendor_id. */
-
+SELECT
+vendor_id
+,count(booth_number)
+FROM vendor_booth_assignments
+GROUP BY vendor_id;
/* 2. The Farmer’s Market Customer Appreciation Committee wants to give a bumper
@@ -67,7 +104,16 @@ sticker to everyone who has ever spent more than $2000 at the market. Write a qu
of customers for them to give stickers to, sorted by last name, then first name.
HINT: This query requires you to join two tables, use an aggregate function, and use the HAVING keyword. */
-
+SELECT
+customer_first_name
+,customer_last_name
+,SUM(quantity*cost_to_customer_per_qty) as total_spending
+FROM customer_purchases AS cp
+INNER JOIN customer AS c
+ ON cp.customer_id = c.customer_id
+GROUP BY cp.customer_id
+HAVING total_spending > 2000
+ORDER BY customer_last_name, customer_first_name;
--Temp Table
@@ -81,7 +127,17 @@ When inserting the new vendor, you need to appropriately align the columns to be
-> To insert the new row use VALUES, specifying the value you want for each column:
VALUES(col1,col2,col3,col4,col5)
*/
+DROP TABLE IF EXISTS temp.new_vendor ;
+
+--make the table
+CREATE TEMP TABLE temp.new_vendor AS
+--definition of the table
+SELECT *
+FROM vendor;
+
+INSERT INTO temp.new_vendor
+VALUES(10, 'Thomass Superfood Store', 'Fresh Focused', 'Thomas', 'Rosenthal');
-- Date
@@ -89,7 +145,11 @@ VALUES(col1,col2,col3,col4,col5)
HINT: you might need to search for strfrtime modifers sqlite on the web to know what the modifers for month
and year are! */
-
+SELECT
+customer_id
+,strftime('%m', market_date) as month
+,strftime('%Y', market_date) as year
+FROM customer_purchases;
/* 2. Using the previous query as a base, determine how much money each customer spent in April 2022.
@@ -97,4 +157,12 @@ Remember that money spent is quantity*cost_to_customer_per_qty.
HINTS: you will need to AGGREGATE, GROUP BY, and filter...
but remember, STRFTIME returns a STRING for your WHERE statement!! */
-
+SELECT
+customer_id
+,SUM(quantity*cost_to_customer_per_qty) as spending
+,strftime('%m', market_date) as month
+,strftime('%Y', market_date) as year
+FROM customer_purchases
+WHERE month = '04'
+AND year = '2022'
+GROUP BY customer_id;
diff --git a/02_activities/assignments/assignment_one_logical_data_model.png b/02_activities/assignments/assignment_one_logical_data_model.png
new file mode 100644
index 000000000..cfdbddf21
Binary files /dev/null and b/02_activities/assignments/assignment_one_logical_data_model.png differ