Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/linting-checks.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: Post-Merge Checks
name: PR Linting Checks

on:
push:
branches:
- main
pull_request:
types: [opened, synchronize, reopened]

permissions:
contents: read
pull-requests: write

jobs:
pre-commit-checks:
linting-checks:
runs-on: ubuntu-latest

steps:
Expand All @@ -21,14 +21,17 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.11.14'
cache: 'pip'

- name: Install dependencies
- name: Install requirements
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: Install dbt dependencies
run: dbt deps

- name: Set up Terraform
uses: hashicorp/setup-terraform@v3

Expand Down
15 changes: 12 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,21 @@ repos:
include: \.(yaml|yml)$

- repo: https://github.com/sqlfluff/sqlfluff
rev: 3.2.3
rev: 4.2.0
hooks:
- id: sqlfluff-lint
additional_dependencies: ['dbt-bigquery==1.8.1', 'sqlfluff-templater-dbt==3.2.3']
additional_dependencies:
- dbt-core==1.11.2
- dbt-bigquery==1.11.0
- sqlfluff==4.2.0
- sqlfluff-templater-dbt==4.2.0

- id: sqlfluff-fix
additional_dependencies: ['dbt-bigquery==1.8.1', 'sqlfluff-templater-dbt==3.2.3']
additional_dependencies:
- dbt-core==1.11.2
- dbt-bigquery==1.11.0
- sqlfluff==4.2.0
- sqlfluff-templater-dbt==4.2.0

- repo: https://github.com/dbt-checkpoint/dbt-checkpoint
rev: v1.2.1
Expand Down
6 changes: 3 additions & 3 deletions .sqlfluff
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ align_scope = bracketed

# AS should be there in table aliases
[sqlfluff:rules:aliasing.table]
aliasing.table = explicit
aliasing = explicit

# AS should be there for renamed columns
[sqlfluff:rules:aliasing.column]
aliasing.column = explicit
aliasing = explicit

# AS should be there after SUM(), MAX() etc
[sqlfluff:rules:aliasing.expression]
aliasing.expression = explicit
aliasing = explicit

# use ALL numbers in GROUP BY, ORDER BY
[sqlfluff:rules:ambiguous.column_references]
Expand Down
3 changes: 3 additions & 0 deletions .sqlfluffignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
target
dbt_packages
logs
40 changes: 0 additions & 40 deletions dbt/analyses/compare_column_values.sql

This file was deleted.

23 changes: 0 additions & 23 deletions dbt/analyses/quick_are_queries_identical.sql

This file was deleted.

20 changes: 0 additions & 20 deletions dbt/analyses/quick_are_relations_identical.sql

This file was deleted.

4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dbt-core==1.11.2
dbt-bigquery==1.11.0
sqlfluff==4.0.0
sqlfluff-templater-dbt==4.0.0
sqlfluff==4.2.0
sqlfluff-templater-dbt==4.2.0
yamllint==1.35.1
pylint==3.3.1
pymarkdownlnt==0.9.24
Expand Down
Loading