Add and configure pre-commit (#62)

.github/workflows/code-quality.yml

@@ -9,16 +9,14 @@ on:
   workflow_dispatch:
     inputs:
       dbt_adapters_branch:
-          description: "The branch of dbt-adapters to evaluate"
-          type: string
-          required: true
-          default: "main"
+        description: "The branch of dbt-adapters to evaluate"
+        type: string
+        default: "main"
   workflow_call:
     inputs:
       dbt_adapters_branch:
         description: "The branch of dbt-adapters to evaluate"
         type: string
-        required: true
         default: "main"
 
 permissions: read-all
@@ -27,34 +25,26 @@ permissions: read-all
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ contains(github.event_name, 'pull_request') && github.event.pull_request.head.ref || github.sha }}
   cancel-in-progress: true
-env:
-  # set DBT_ADAPTERS_BRANCH to the input value if the event is a workflow_dispatch (workflow_call uses the same event_name),
-  # otherwise use 'main'
-  DBT_ADAPTERS_BRANCH: ${{ github.event_name == 'workflow_dispatch' && inputs.dbt_adapters_branch || 'main' }}
+
 jobs:
   code-quality:
     name: Code Quality
     runs-on: ubuntu-latest
 
-
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
         with:
           persist-credentials: false
 
       - name: Update Adapters and Core branches
+        if: ${{ contains(github.event_name, 'workflow_') }}
         shell: bash
-        run: |
-          ./.github/scripts/update_dev_packages.sh \
-            $DBT_ADAPTERS_BRANCH \
-            "main"
+        run: ./.github/scripts/update_dev_packages.sh ${{ inputs.dbt_adapters_branch }} "main"
 
       - name: Setup `hatch`
         uses: dbt-labs/dbt-adapters/.github/actions/setup-hatch@main
 
-      - name: Run linters
-        run: hatch run lint:all
-
-      - name: Run typechecks
-        run: hatch run typecheck:all
+      - name: Run code quality
+        shell: bash
+        run: hatch run code-quality

.github/workflows/integration-tests.yml

@@ -31,7 +31,6 @@ on:
         required: false
         default: "main"
 
-
 permissions: read-all
 
 # will cancel previous workflows triggered by the same event and for the same ref for PRs or same SHA otherwise
@@ -101,14 +100,6 @@ jobs:
           POSTGRES_TEST_DATABASE: dbt
           POSTGRES_TEST_THREADS: 4
 
-      - name: Publish results
-        uses: dbt-labs/dbt-adapters/.github/actions/publish-results@main
-        if: always()
-        with:
-          source-file: "results.csv"
-          file-name: "integration_results"
-          python-version: ${{ matrix.python-version }}
-
   psycopg2-check:
     name: "Test psycopg2 build version"
     runs-on: ${{ matrix.scenario.platform }}

.github/workflows/unit-tests.yml

@@ -39,11 +39,3 @@ jobs:
       - name: Run unit tests
         run: hatch run unit-tests:all
         shell: bash
-
-      - name: Publish results
-        uses: dbt-labs/dbt-adapters/.github/actions/publish-results@main
-        if: always()
-        with:
-          source-file: "results.csv"
-          file-name: "unit_results"
-          python-version: ${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -0,0 +1,55 @@
+default_language_version:
+  python: python3
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: check-yaml
+    args: [--unsafe]
+  - id: check-json
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
+  - id: check-case-conflict
+
+-   repo: https://github.com/dbt-labs/pre-commit-hooks
+    rev: v0.1.0a1
+    hooks:
+    -   id: dbt-core-in-adapters-check
+
+-   repo: https://github.com/psf/black
+    rev: 24.4.0
+    hooks:
+    -   id: black
+        args:
+        -   --line-length=99
+        -   --target-version=py38
+        -   --target-version=py39
+        -   --target-version=py310
+        -   --target-version=py311
+
+-   repo: https://github.com/pycqa/flake8
+    rev: 7.0.0
+    hooks:
+    -   id: flake8
+        exclude: tests/
+        args:
+        -   --max-line-length=99
+        -   --select=E,F,W
+        -   --ignore=E203,E501,E741,W503,W504
+        -   --per-file-ignores=*/__init__.py:F401
+
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.9.0
+    hooks:
+    -   id: mypy
+        args:
+        -   --explicit-package-bases
+        -   --ignore-missing-imports
+        -   --pretty
+        -   --show-error-codes
+        files: ^dbt/adapters/postgres
+        additional_dependencies:
+        -   types-PyYAML
+        -   types-protobuf
+        -   types-pytz

CHANGELOG.md

@@ -29,4 +29,3 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 ### Under the Hood
 
 * Update dependabot configuration to cover GHA
-

CONTRIBUTING.md

@@ -164,7 +164,7 @@ Remember to commit and push the file that's created.
 
 ### Signing the CLA
 
-> **_NOTE:_** All contributors to `dbt-postgres` must sign the 
+> **_NOTE:_** All contributors to `dbt-postgres` must sign the
 > [Contributor License Agreement](https://docs.getdbt.com/docs/contributor-license-agreements)(CLA).
 
 Maintainers will be unable to merge contributions until the contributor signs the CLA.

dbt/adapters/postgres/relation.py

@@ -20,19 +20,23 @@
 
 @dataclass(frozen=True, eq=False, repr=False)
 class PostgresRelation(BaseRelation):
-    renameable_relations: FrozenSet[RelationType] = field(default_factory=lambda: frozenset(
-        {
-            RelationType.View,
-            RelationType.Table,
-            RelationType.MaterializedView,
-        }
-    ))
-    replaceable_relations: FrozenSet[RelationType] = field(default_factory=lambda: frozenset(
-        {
-            RelationType.View,
-            RelationType.Table,
-        }
-    ))
+    renameable_relations: FrozenSet[RelationType] = field(
+        default_factory=lambda: frozenset(
+            {
+                RelationType.View,
+                RelationType.Table,
+                RelationType.MaterializedView,
+            }
+        )
+    )
+    replaceable_relations: FrozenSet[RelationType] = field(
+        default_factory=lambda: frozenset(
+            {
+                RelationType.View,
+                RelationType.Table,
+            }
+        )
+    )
 
     def __post_init__(self):
         # Check for length of Postgres table/view names.

dbt/adapters/postgres/relation_configs/index.py

@@ -23,7 +23,7 @@ class PostgresIndexMethod(StrEnum):
 
     @classmethod
     def default(cls) -> "PostgresIndexMethod":
-        return cls.btree
+        return cls("btree")
 
 
 @dataclass(frozen=True, eq=True, unsafe_hash=True)

pyproject.toml

@@ -59,56 +59,30 @@ path = "dbt/adapters/postgres/__version__.py"
 dependencies = [
     "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git",
     "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git",
+    'pre-commit==3.7.0;python_version>="3.9"',
+    'pre-commit==3.5.0;python_version=="3.8"',
 ]
-
-[tool.hatch.envs.lint]
-detached = true
-dependencies = [
-    "black>=24.3",
-    "flake8",
-    "Flake8-pyproject",
-]
-[tool.hatch.envs.lint.scripts]
-all = [
-    "black",
-    "flake8",
-]
-black = "python -m black ."
-flake8 = "python -m flake8 ."
-
-[tool.hatch.envs.typecheck]
-dependencies = [
-    "mypy",
-    "types-protobuf",
-    "types-pytz",
-]
-[tool.hatch.envs.typecheck.scripts]
-all = "python -m mypy ."
+[tool.hatch.envs.default.scripts]
+dev = "pre-commit install"
+code-quality = "pre-commit run --all-files"
 
 [tool.hatch.envs.unit-tests]
 dependencies = [
+    "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git",
+    "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git",
+    "dbt-core @ git+https://github.com/dbt-labs/dbt-core.git#subdirectory=core",
     "freezegun",
     "pytest",
     "pytest-dotenv",
     "pytest-mock",
     "pytest-xdist",
 ]
-extra-dependencies = [
-    # TODO: remove `dbt-core` dependencies from unit tests
-    "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git",
-    "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git",
-    "dbt-core @ git+https://github.com/dbt-labs/dbt-core.git#subdirectory=core",
-]
 [tool.hatch.envs.unit-tests.scripts]
 all = "python -m pytest {args:tests/unit}"
 
 [tool.hatch.envs.integration-tests]
 template = "unit-tests"
 extra-dependencies = [
-    # TODO: remove `dbt-core` dependencies from integration tests
-    "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git",
-    "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git",
-    "dbt-core @ git+https://github.com/dbt-labs/dbt-core.git#subdirectory=core",
     "dbt-tests-adapter @ git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter",
 ]
 [tool.hatch.envs.integration-tests.env-vars]
@@ -125,8 +99,6 @@ dependencies = [
     "twine",
     "check-wheel-contents",
 ]
-
-
 [tool.hatch.envs.build.scripts]
 check-all = [
     "- check-wheel",
@@ -143,35 +115,9 @@ check-sdist = [
     "pip freeze | grep dbt-postgres",
 ]
 
-[tool.black]
-line-length = 99
-target-version = ['py38']
-
-[tool.flake8]
-select = ["E", "W", "F"]
-ignore = ["E203", "E501", "E741", "W503", "W504"]
-exclude = ["tests", "venv", ".hatch_venvs"]
-per-file-ignores = ["*/__init__.py: F401"]
-
-[tool.mypy]
-namespace_packages = true
-show_error_codes = true
-explicit_package_bases = true
-ignore_missing_imports = true
-pretty = true
-files = [
-    "dbt/adapters/postgres",
-    "tests/unit",
-]
-exclude = [
-    "tests/functional",
-    "venv",
-    ".hatch_venvs",
-]
-
 [tool.pytest]
 env_files = ["test.env"]
 testpaths = [
     "tests/functional",
     "tests/unit",
-]
+]

tests/functional/artifacts/test_artifacts.py

@@ -1,4 +1,3 @@
-from datetime import datetime
 import jsonschema
 import os
 
@@ -12,16 +11,6 @@
 )
 import pytest
 
-from tests.functional.artifacts.expected_manifest import (
-    expected_references_manifest,
-    expected_seeded_manifest,
-    expected_versions_manifest,
-)
-from tests.functional.artifacts.expected_run_results import (
-    expected_references_run_results,
-    expected_run_results,
-    expected_versions_run_results,
-)
 from tests.functional.utils import run_dbt, run_dbt_and_capture
 
 

tests/functional/artifacts/test_previous_version_state.py

@@ -5,7 +5,7 @@
 from dbt.artifacts.schemas.base import get_artifact_schema_version
 from dbt.artifacts.schemas.run import RunResultsArtifact
 from dbt.contracts.graph.manifest import WritableManifest
-from dbt.exceptions import IncompatibleSchemaError
+from dbt.artifacts.exceptions import IncompatibleSchemaError
 from dbt.tests.util import get_manifest
 import pytest
 

tests/functional/context_methods/test_builtin_functions.py

@@ -1,5 +1,4 @@
 import json
-import os
 
 from dbt.tests.util import write_file
 from dbt_common.exceptions import CompilationError

tests/functional/dbt_debug/test_dbt_debug.py

@@ -1,9 +1,6 @@
 import pytest
-import os
-import re
-import yaml
 
-from tests.functional.utils import run_dbt, run_dbt_and_capture
+from tests.functional.utils import run_dbt_and_capture
 
 MODELS__MODEL_SQL = """
 seled 1 as id

tests/functional/dbt_runner.py

@@ -25,13 +25,15 @@ def assert_run_results_have_compiled_node_attributes(
 
 
 class dbtTestRunner(dbtRunner):
+    exit_assertions: List[Callable[[List[str], dbtRunnerResult], None]]
+
     def __init__(
         self,
         manifest: Optional[Manifest] = None,
         callbacks: Optional[List[Callable[[EventMsg], None]]] = None,
         exit_assertions: Optional[List[Callable[[List[str], dbtRunnerResult], None]]] = None,
     ):
-        self.exit_assertions = exit_assertions if exit_assertions else _STANDARD_ASSERTIONS
+        self.exit_assertions = exit_assertions if exit_assertions else _STANDARD_ASSERTIONS  # type: ignore
         super().__init__(manifest, callbacks)
 
     def invoke(self, args: List[str], **kwargs) -> dbtRunnerResult: