Add sqlfluff to CI

.github/workflows/ci.yml

@@ -19,3 +19,5 @@ jobs:
         run: python3 el.py -lc
       - name: Run T
         run: dbt deps && dbt build
+      - name: Lint SQL
+        run: sqlfluff lint models --format github-annotation-native

.pre-commit-config.yaml

@@ -20,9 +20,9 @@ repos:
     rev: 23.9.1
     hooks:
       - id: black
-  # - repo: https://github.com/sqlfluff/sqlfluff
-  #   rev: 2.3.2
-  #   hooks:
-  #     - id: sqlfluff-fix
-  #       additional_dependencies:
-  #         ["dbt-metricflow[duckdb]~=0.3.0", "sqlfluff-templater-dbt"]
+  - repo: https://github.com/sqlfluff/sqlfluff
+    rev: 2.3.2
+    hooks:
+      - id: sqlfluff-fix
+        additional_dependencies:
+          ["dbt-metricflow[duckdb]~=0.3.0", "sqlfluff-templater-dbt"]

.sqlfluff

@@ -11,5 +11,5 @@ tab_space_size = 4
 [sqlfluff:rules:capitalisation.keywords]
 capitalisation_policy = lower
 
-[sqlfluff:convention]
-select_trailing_comma = required
+[sqlfluff:rules:convention.select_trailing_comma]
+select_clause_trailing_comma = require

models/marts/issue_events.sql

@@ -2,7 +2,7 @@ with
 
 issue_events as (
 
-    select * from {{ ref('stg_events') }}
+    select *, from {{ ref('stg_events') }}
 
     where event_type = 'IssuesEvent'
 
@@ -30,10 +30,10 @@ unnest_json as (
         payload -> '$.issue' ->> '$.body' as issue_body,
         payload ->> '$.changes' as issue_changes,
         payload ->> '$.label' as issue_label,
-        payload ->> '$.assignee' as issue_assignee
+        payload ->> '$.assignee' as issue_assignee,
 
     from issue_events
 
 )
 
-select * from unnest_json
+select *, from unnest_json

models/marts/pull_request_events.sql

@@ -2,7 +2,7 @@ with
 
 pull_request_events as (
 
-    select * from {{ ref('stg_events') }}
+    select *, from {{ ref('stg_events') }}
 
     where event_type = 'PullRequestEvent'
 
@@ -53,10 +53,10 @@ unnest_json as (
         payload
         -> '$.pull_request'
         -> '$.repo'
-        ->> '$.full_name' as repo_full_name
+        ->> '$.full_name' as repo_full_name,
 
     from pull_request_events
 
 )
 
-select * from unnest_json
+select *, from unnest_json

models/marts/push_events.sql

@@ -2,7 +2,7 @@ with
 
 push_events as (
 
-    select * from {{ ref('stg_events') }}
+    select *, from {{ ref('stg_events') }}
 
     where event_type in ('PushEvent')
 
@@ -27,4 +27,4 @@ unnest_json as (
 
 )
 
-select * from unnest_json
+select *, from unnest_json

models/marts/repos.sql

@@ -11,7 +11,7 @@ distill_repos_from_events as (
         repo_id,
         repo_name,
         repo_url,
-        max(event_created_at) as repo_state_last_seen_at
+        max(event_created_at) as repo_state_last_seen_at,
 
     from {{ ref('stg_events') }}
 
@@ -28,7 +28,7 @@ rank_most_recent_repo_state as (
         row_number() over (
             partition by repo_id
             order by repo_state_last_seen_at desc
-        ) as repo_recency_rank
+        ) as repo_recency_rank,
 
     from distill_repos_from_events
 
@@ -39,12 +39,12 @@ pull_most_recent_repo_state as (
     select
         repo_id,
         repo_name,
-        repo_url
+        repo_url,
 
     from rank_most_recent_repo_state
 
     where repo_recency_rank = 1
 
 )
 
-select * from pull_most_recent_repo_state
+select *, from pull_most_recent_repo_state

models/marts/users.sql

@@ -19,7 +19,7 @@ distill_user_states_from_events as (
         actor_display_login,
         actor_url,
         actor_avatar_url,
-        max(event_created_at) as user_state_last_seen_at
+        max(event_created_at) as user_state_last_seen_at,
 
     from {{ ref('stg_events') }}
 
@@ -39,7 +39,7 @@ rank_user_state_recency as (
         row_number() over (
             partition by actor_id
             order by user_state_last_seen_at desc
-        ) as user_state_recency_rank
+        ) as user_state_recency_rank,
 
     from distill_user_states_from_events
 
@@ -53,12 +53,12 @@ pull_most_recent_user_state as (
         actor_login,
         actor_display_login,
         actor_url,
-        actor_avatar_url
+        actor_avatar_url,
 
     from rank_user_state_recency
 
     where user_state_recency_rank = 1
 
 )
 
-select * from pull_most_recent_user_state
+select *, from pull_most_recent_user_state

models/staging/github/stg_events.sql

@@ -2,7 +2,7 @@ with
 
 source as (
 
-    select * from {{ source('octocatalog', 'github_events') }}
+    select *, from {{ source('octocatalog', 'github_events') }}
 
 ),
 
@@ -36,10 +36,10 @@ renamed as (
         org['login'] as org_login,
         org['gravatar_id'] as org_gravatar_id,
         org['url'] as org_url,
-        org['avatar_url'] as org_avatar_url
+        org['avatar_url'] as org_avatar_url,
 
     from source
 
 )
 
-select * from renamed
+select *, from renamed