update dbt project

README.md

@@ -1,3 +1,6 @@
+> [!IMPORTANT]
+> This repo is no longer actively maintained. It’s been preserved for continuity and free access. The Jaffle Shop has lived a rich life as dbt’s demo project, but has been superseded by two newer repositories: [`jaffle-shop`](https://github.com/dbt-labs/jaffle-shop), the premier demo project for dbt Cloud, and [`jaffle_shop_duckdb`](https://github.com/dbt-labs/jaffle_shop_duckdb) which supports working locally via DuckDB for those without access to a cloud warehouse. You’re welcome to continue using this repo as an open source resource, just know it will not be actively maintained moving forward.
+
 ## Testing dbt project: `jaffle_shop`
 
 `jaffle_shop` is a fictional ecommerce store. This dbt project transforms raw data from an app database into a customers and orders model ready for analytics.
@@ -8,7 +11,7 @@ What this repo _is_:
 
 What this repo _is not_:
 - A tutorial — check out the [Getting Started Tutorial](https://docs.getdbt.com/tutorial/setting-up) for that. Notably, this repo contains some anti-patterns to make it self-contained, namely the use of seeds instead of sources.
-- A demonstration of best practices — check out the [dbt Learn Demo](https://github.com/fishtown-analytics/dbt-learn-demo-v2-archive) repo instead. We want to keep this project as simple as possible. As such, we chose not to implement:
+- A demonstration of best practices — check out the [dbt Learn Demo](https://github.com/dbt-labs/dbt-learn-demo) repo instead. We want to keep this project as simple as possible. As such, we chose not to implement:
     - our standard file naming patterns (which make more sense on larger projects, rather than this five-model project)
     - a pull request flow
     - CI/CD integrations

dbt_project.yml

@@ -1,13 +1,14 @@
-
 name: 'jaffle_shop'
+
+config-version: 2
 version: '0.1'
+
 profile: 'jaffle_shop'
-config-version: 2
 
-source-paths: ["models"]
-analysis-paths: ["analysis"]
+model-paths: ["models"]
+seed-paths: ["seeds"]
 test-paths: ["tests"]
-data-paths: ["data"]
+analysis-paths: ["analysis"]
 macro-paths: ["macros"]
 
 target-path: "target"
@@ -16,6 +17,8 @@ clean-targets:
     - "dbt_modules"
     - "logs"
 
+require-dbt-version: [">=1.0.0", "<2.0.0"]
+
 models:
   jaffle_shop:
       materialized: table

models/customers.sql

@@ -26,7 +26,7 @@ customer_orders as (
         count(order_id) as number_of_orders
     from orders
 
-    group by 1
+    group by customer_id
 
 ),
 
@@ -38,9 +38,10 @@ customer_payments as (
 
     from payments
 
-    left join orders using (order_id)
+    left join orders on
+         payments.order_id = orders.order_id
 
-    group by 1
+    group by orders.customer_id
 
 ),
 
@@ -57,9 +58,11 @@ final as (
 
     from customers
 
-    left join customer_orders using (customer_id)
+    left join customer_orders
+        on customers.customer_id = customer_orders.customer_id
 
-    left join customer_payments using (customer_id)
+    left join customer_payments
+        on  customers.customer_id = customer_payments.customer_id
 
 )
 

models/orders.sql

@@ -25,7 +25,7 @@ order_payments as (
 
     from payments
 
-    group by 1
+    group by order_id
 
 ),
 
@@ -47,7 +47,9 @@ final as (
 
     from orders
 
-    left join order_payments using (order_id)
+
+    left join order_payments
+        on orders.order_id = order_payments.order_id
 
 )
 

models/staging/stg_payments.sql

@@ -15,7 +15,7 @@ renamed as (
         order_id,
         payment_method,
 
-        --`amount` is currently stored in cents, so we convert it to dollars
+        -- `amount` is currently stored in cents, so we convert it to dollars
         amount / 100 as amount
 
     from source