diff --git a/02_activities/assignments/assignment1.sql b/02_activities/assignments/assignment1.sql
index 2e89fa7af..78208c6be 100644
--- a/02_activities/assignments/assignment1.sql
+++ b/02_activities/assignments/assignment1.sql
@@ -5,20 +5,28 @@
--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,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 =4 OR product_id =9;
-- option 2
-
+SELECT *
+FROM customer_purchases
+WHERE product_id IN (4,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,15 @@ filtered by vendor IDs between 8 and 10 (inclusive) using either:
2. one condition using BETWEEN
*/
-- option 1
-
-
+SELECT *
+,quantity * cost_to_customer_per_qty as price
+FROM customer_purchases
+where vendor_id >=8 AND vendor_id <=10;
-- option 2
-
+SELECT *
+,quantity * cost_to_customer_per_qty as price
+FROM customer_purchases
+where vendor_id BETWEEN 8 AND 10;
--CASE
@@ -38,19 +51,36 @@ 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 product_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 product_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 as v
+INNER JOIN vendor_booth_assignments as vba
+ON v.vendor_id = vba.vendor_id
+ORDER BY vendor_name, market_date;
@@ -60,6 +90,11 @@ vendor_id field they both have in common, and sorts the result by vendor_name, t
/* 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 booth_number;
+
/* 2. The Farmer’s Market Customer Appreciation Committee wants to give a bumper
@@ -68,7 +103,12 @@ 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 c.customer_first_name, c.customer_last_name
+,sum(cp.quantity*cp.cost_to_customer_per_qty) as spent
+FROM customer as c
+INNER JOIN customer_purchases as cp ON c.customer_id = cp.customer_id
+GROUP BY c.customer_first_name, c.customer_last_name
+HAVING spent > 2000;
--Temp Table
/* 1. Insert the original vendor table into a temp.new_vendor and then add a 10th vendor:
@@ -81,7 +121,12 @@ 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)
*/
+CREATE TABLE temp.new_vendor AS
+SELECT *
+FROM vendor;
+INSERT INTO new_vendor
+VALUES(10, 'Thomass Superfood Store', 'a Fresh Focused store', 'Thomas', 'Rosenthal');
-- Date
diff --git a/02_activities/assignments/images/Product&CustomerPurchase&Customer Diagram.png b/02_activities/assignments/images/Product&CustomerPurchase&Customer Diagram.png
new file mode 100644
index 000000000..bc486af89
Binary files /dev/null and b/02_activities/assignments/images/Product&CustomerPurchase&Customer Diagram.png differ
diff --git a/02_activities/assignments/images/Product&CustomerPurchases&Customer Diagram.drawio b/02_activities/assignments/images/Product&CustomerPurchases&Customer Diagram.drawio
new file mode 100644
index 000000000..8b9ddb6a8
--- /dev/null
+++ b/02_activities/assignments/images/Product&CustomerPurchases&Customer Diagram.drawio
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/02_activities/assignments/images/farmersmarket.db b/02_activities/assignments/images/farmersmarket.db
new file mode 100644
index 000000000..4720f2483
Binary files /dev/null and b/02_activities/assignments/images/farmersmarket.db differ
diff --git a/02_activities/assignments/images/farmersmarket.sqbpro b/02_activities/assignments/images/farmersmarket.sqbpro
new file mode 100644
index 000000000..eba942125
--- /dev/null
+++ b/02_activities/assignments/images/farmersmarket.sqbpro
@@ -0,0 +1 @@
+-- Reference to file "C:/Users/aktur/sql/02_activities/assignments/assignment1.sql" (not supported by this version) --
diff --git a/05_src/sql/farmersmarket.db-journal b/05_src/sql/farmersmarket.db-journal
new file mode 100644
index 000000000..54ae784d8
Binary files /dev/null and b/05_src/sql/farmersmarket.db-journal differ