diff --git a/ingestion/examples/sample_data/datasets/query_log b/ingestion/examples/sample_data/datasets/query_log
index 9c5bd4ec62c..d0f537d8cf8 100644
--- a/ingestion/examples/sample_data/datasets/query_log
+++ b/ingestion/examples/sample_data/datasets/query_log
@@ -1,32 +1,18 @@
 query, database
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
@@ -49,62 +35,52 @@ join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id","shopify"
+"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id", "shopify"
 "select dim_product_variant.product_id, dim_shop.shop_id, dim_shop.name from dim_shop join dim_product_variant on dim_shop.shop_id = dim_product_variant.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_product.title from fact_line join dim_product on fact_line.product_id=dim_product.product_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_product.title from fact_line_item join dim_product on fact_line_item.product_id=dim_product.product_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
@@ -189,34 +165,20 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
@@ -239,62 +201,52 @@ join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id","shopify"
+"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id", "shopify"
 "select dim_product_variant.product_id, dim_shop.shop_id, dim_shop.name from dim_shop join dim_product_variant on dim_shop.shop_id = dim_product_variant.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_product.title from fact_line join dim_product on fact_line.product_id=dim_product.product_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_product.title from fact_line_item join dim_product on fact_line_item.product_id=dim_product.product_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
@@ -363,10 +315,10 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
@@ -379,34 +331,20 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
@@ -429,62 +367,52 @@ join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id","shopify"
+"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id", "shopify"
 "select dim_product_variant.product_id, dim_shop.shop_id, dim_shop.name from dim_shop join dim_product_variant on dim_shop.shop_id = dim_product_variant.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_product.title from fact_line join dim_product on fact_line.product_id=dim_product.product_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_product.title from fact_line_item join dim_product on fact_line_item.product_id=dim_product.product_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
@@ -553,10 +481,10 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
@@ -569,34 +497,20 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
@@ -619,62 +533,52 @@ join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id","shopify"
+"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id", "shopify"
 "select dim_product_variant.product_id, dim_shop.shop_id, dim_shop.name from dim_shop join dim_product_variant on dim_shop.shop_id = dim_product_variant.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_product.title from fact_line join dim_product on fact_line.product_id=dim_product.product_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_product.title from fact_line_item join dim_product on fact_line_item.product_id=dim_product.product_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
@@ -743,10 +647,10 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
@@ -759,34 +663,20 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
 "select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer", "shopify"
@@ -809,62 +699,52 @@ join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id","shopify"
+"select dim_product_variant.product_id, dim_product_variant.title, dim_product_variant.barcode, dim_product.vendor from dim_product left join dim_product_variant on dim_product_variant.product_id=dim_product.product_id", "shopify"
 "select dim_product_variant.product_id, dim_shop.shop_id, dim_shop.name from dim_shop join dim_product_variant on dim_shop.shop_id = dim_product_variant.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
 "select dim_product.title, dim_product.vendor, dim_product.shop_id from dim_product left join dim_product.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left
-join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
-"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name
-from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on
-dim_staff.shop_id=dim_shop.shop_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, fact_line.price,fact_order.name, fact_order.total_price from fact_line join fact_order on fact_line.order_id=fact_order.order_id", "shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_shop.name from fact_line join dim_shop on fact_line.shop_id=dim_shop.shop_id","shopify"
-"select fact_line.product_title, dim_product.title from fact_line join dim_product on fact_line.product_id=dim_product.product_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
-"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id","shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_customer.customer_id, dim_customer.total_order_count, dim_customer.total_order_value from dim_customer left join dim_shop on dim_customer.shop_id=dim_shop.shop_id", "shopify"
+"select dim_address.address_id, dim_address.shop_id, dim_address.first_name,dim_address.last_name, dim_shop.name from dim_address left join dim_shop on dim_address.shop_id = dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select dim_staff.user_id,dim_staff.first_name, dim_staff.last_name, dim_shop.shop_id from dim_staff join dim_shop on dim_staff.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, fact_line_item.price,fact_order.name, fact_order.total_price from fact_line_item join fact_order on fact_line_item.order_id=fact_order.order_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_shop.name from fact_line_item join dim_shop on fact_line_item.shop_id=dim_shop.shop_id", "shopify"
+"select fact_line_item.product_title, dim_product.title from fact_line_item join dim_product on fact_line_item.product_id=dim_product.product_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select dim_api_client.title, fact_order.location_id from dim_api_client join fact_order on dim_api_client.api_client_id=fact_order.api_client_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.first_name,dim_customer.last_name, dim_customer.city from dim_customer join fact_order on dim_customer.customer_id=fact_order.customer_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_customer.total_order_value from dim_customer join fact_order on dim_customer.shop_id=fact_order.shop_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
+"select fact_order.name, fact_order.total_price, dim_staff.email from fact_order join dim_staff on fact_order.user_id=dim_staff.user_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
 "select fact_sale.gross_sales, fact_sale.total_sale, fact_sale.shipping, dim_address.city from fact_sale join dim_address on fact_sale.billing_address_id=dim_address.address_id", "shopify"
@@ -933,10 +813,10 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
 "select fact_sale.total_sale, dim_product_variant.sku, dim_product_variant.price from fact_sale join dim_product_variant on fact_sale.product_variant_id=dim_product.product_variant_id", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
-"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.shipping_address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
+"select fact_sale.gross_sale, dim_address.city from fact_sale join dim_address on fact_sale.shipping_address_id=dim_address.address_id group by dim_address.city", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_shop.name, dim_shop.shop_id from fact_sale join dim_shop on fact_sale.shop_id = dim_shop.shop_id group by dim_shop.shop_id", "shopify"
@@ -948,9 +828,4 @@ dim_staff.shop_id=dim_shop.shop_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
 "select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
-"select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
-
-
-
-
-
+"select fact_sale.gross_sale, dim_staff.first_name, dim_staff.last_name from fact_sale join dim_staff on fact_sale.user_id = dim_staff.user_id", "shopify"
\ No newline at end of file
diff --git a/ingestion/examples/workflows/bigquery_usage.json b/ingestion/examples/workflows/bigquery_usage.json
index f439a23e448..951aeecbeea 100644
--- a/ingestion/examples/workflows/bigquery_usage.json
+++ b/ingestion/examples/workflows/bigquery_usage.json
@@ -27,7 +27,8 @@
   "bulk_sink": {
     "type": "metadata-usage",
     "config": {
-      "filename": "/tmp/bigquery_usage"
+      "filename": "/tmp/bigquery_usage",
+      "service_name": "gcp_bigquery"
     }
   },
   "metadata_server": {
diff --git a/ingestion/examples/workflows/redshift_usage.json b/ingestion/examples/workflows/redshift_usage.json
index e2b33d915b3..467e0101dae 100644
--- a/ingestion/examples/workflows/redshift_usage.json
+++ b/ingestion/examples/workflows/redshift_usage.json
@@ -26,7 +26,8 @@
   "bulk_sink": {
     "type": "metadata-usage",
     "config": {
-      "filename": "/tmp/redshift_usage"
+      "filename": "/tmp/redshift_usage",
+      "service_name": "aws_redshift"
     }
   },
   "metadata_server": {
diff --git a/ingestion/examples/workflows/snowflake_usage.json b/ingestion/examples/workflows/snowflake_usage.json
index 285df234e5e..6be03e1b98e 100644
--- a/ingestion/examples/workflows/snowflake_usage.json
+++ b/ingestion/examples/workflows/snowflake_usage.json
@@ -26,7 +26,8 @@
   "bulk_sink": {
     "type": "metadata-usage",
     "config": {
-      "filename": "/tmp/snowflake_usage"
+      "filename": "/tmp/snowflake_usage",
+      "service_name": "snowflake"
     }
   },
   "metadata_server": {