diff --git a/02_activities/assignments/Microcredential_Cohort/Assignment1.md b/02_activities/assignments/Microcredential_Cohort/Assignment1.md
index 45f0f5250..3ae22d4c2 100644
--- a/02_activities/assignments/Microcredential_Cohort/Assignment1.md
+++ b/02_activities/assignments/Microcredential_Cohort/Assignment1.md
@@ -120,6 +120,7 @@ Steps to complete this part of the assignment:
#### SELECT
1. Write a query that returns everything in the customer table.
+
2. Write a query that displays all of the columns and 10 rows from the customer table, sorted by customer_last_name, then customer_first_ name.
-
diff --git a/02_activities/assignments/Microcredential_Cohort/assignment1.sql b/02_activities/assignments/Microcredential_Cohort/assignment1.sql
index 518415744..9e9ef05f5 100644
--- a/02_activities/assignments/Microcredential_Cohort/assignment1.sql
+++ b/02_activities/assignments/Microcredential_Cohort/assignment1.sql
@@ -6,7 +6,8 @@
--SELECT
/* 1. Write a query that returns everything in the customer table. */
--QUERY 1
-
+SELECT *
+FROM customer;
@@ -16,8 +17,10 @@
/* 2. Write a query that displays all of the columns and 10 rows from the customer table,
sorted by customer_last_name, then customer_first_ name. */
--QUERY 2
-
-
+SELECT *
+FROM customer
+ORDER BY customer_last_name, customer_first_name
+LIMIT 10;
--END QUERY
@@ -27,7 +30,11 @@ sorted by customer_last_name, then customer_first_ name. */
/* 1. Write a query that returns all customer purchases of product IDs 4 and 9.
Limit to 25 rows of output. */
--QUERY 3
-
+SELECT *
+FROM customer_purchases
+WHERE product_id = '4'
+OR product_id = '9'
+LIMIT 25;
@@ -42,9 +49,10 @@ filtered by customer IDs between 8 and 10 (inclusive) using either:
Limit to 25 rows of output.
*/
--QUERY 4
-
-
-
+SELECT *, quantity * cost_per_quantity as price
+FROM customer_purchases
+WHERE customer_id BETWEEN 8 AND 10
+LIMIT 25;
--END QUERY
@@ -55,8 +63,12 @@ Using the product table, write a query that outputs the product_id and product_n
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.” */
--QUERY 5
-
-
+SELECT product_id, product_name,
+CASE
+ WHEN product_qty_type = 'unit' THEN 'unit'
+ ELSE 'bulk'
+END as prod_qty_type_condensed
+FROM product;
--END QUERY
@@ -66,8 +78,17 @@ if the product_qty_type is “unit,” and otherwise displays the word “bulk.
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. */
--QUERY 6
+SELECT product_id, product_name,
+CASE
+ WHEN product_qty_type = 'unit' THEN 'unit'
+ ELSE 'bulk'
+END as prod_qty_type_condensed,
+CASE
+ WHEN LOWER(product_name) LIKE '%pepper%' THEN 1
+ ELSE 0
+END as pepper_flag
-
+FROM product;
--END QUERY
@@ -78,7 +99,12 @@ contains the word “pepper” (regardless of capitalization), and otherwise out
vendor_id field they both have in common, and sorts the result by market_date, then vendor_name.
Limit to 24 rows of output. */
--QUERY 7
-
+SELECT *
+FROM vendor as v
+INNER JOIN vendor_booth_assignments as vba
+ON v.vendor_id = vba.vendor_id
+ORDER BY market_date, vendor_name
+LIMIT 24;
@@ -91,10 +117,13 @@ Limit to 24 rows of output. */
-- 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. */
---QUERY 8
-
-
-
+--QUERY
+SELECT v.vendor_id, v.vendor_name,
+COUNT (vba.vendor_id) as booth_count
+FROM vendor_booth_assignments as vba
+INNER JOIN vendor as v
+ON vba.vendor_id = v.vendor_id
+GROUP BY v.vendor_id, v.vendor_name
--END QUERY
@@ -105,9 +134,14 @@ 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. */
--QUERY 9
-
-
-
+SELECT c.customer_id, c.customer_first_name, c.customer_last_name,
+SUM(cp.quantity * cp.cost_per_quantity) as total_spent
+FROM customer as c
+INNER JOIN customer_purchases as cp
+ON c.customer_id = cp.customer_id
+GROUP BY c.customer_id, c.customer_first_name, c.customer_last_name
+HAVING SUM(cp.quantity * cp.cost_per_quantity) > 2000
+ORDER BY c.customer_last_name, c.customer_first_name
--END QUERY
@@ -124,9 +158,12 @@ When inserting the new vendor, you need to appropriately align the columns to be
VALUES(col1,col2,col3,col4,col5)
*/
--QUERY 10
+DROP TABLE IF EXISTS temp.new_vendor;
+CREATE TABLE temp.new_vendor AS
+SELECT * FROM vendor;
-
-
+INSERT INTO temp.new_vendor (vendor_id, vendor_name, vendor_type, vendor_owner_first_name, vendor_owner_last_name, vendor_address)
+VALUES (10, 'Thomass Superfood Store', 'Fresh Focused', 'Thomas', 'Rosenthal');
--END QUERY
diff --git a/02_activities/assignments/Microcredential_Cohort/logical_model_diagram_assignment1.png b/02_activities/assignments/Microcredential_Cohort/logical_model_diagram_assignment1.png
new file mode 100644
index 000000000..d11ed55d9
Binary files /dev/null and b/02_activities/assignments/Microcredential_Cohort/logical_model_diagram_assignment1.png differ