Remove dbt-postgres and dbt-tests-adapter from dbt-core (dbt-labs#9492)

* delete dbt-tests-adapter and dbt-postgres from dbt-core * update non-code files to reflect change * add changie * update build-dist.sh * update tox.ini * fix build-dist.sh * move adapter tests into /functional dir * remove adapter unit tests * update code comments and README.md
Petruc-Rares · Feb 5, 2024 · 15dcb9a · 15dcb9a
1 parent 7885e87
commit 15dcb9a
Show file tree

Hide file tree

Showing 249 changed files with 133 additions and 4,176 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -36,12 +36,4 @@ first_value = 1
 
 [bumpversion:file:core/dbt/version.py]
 
-[bumpversion:file:plugins/postgres/setup.py]
-
-[bumpversion:file:plugins/postgres/dbt/adapters/postgres/__version__.py]
-
 [bumpversion:file:docker/Dockerfile]
-
-[bumpversion:file:tests/adapter/setup.py]
-
-[bumpversion:file:tests/adapter/dbt/tests/adapter/__version__.py]
diff --git a/.changes/header.tpl.md b/.changes/header.tpl.md
@@ -1,6 +1,6 @@
 # dbt Core Changelog
 
-- This file provides a full account of all changes to `dbt-core` and `dbt-postgres`
+- This file provides a full account of all changes to `dbt-core`
 - Changes are listed under the (pre)release in which they first appear. Subsequent releases include changes from previous releases.
 - "Breaking changes" listed under a version may require action from end users or external maintainers when upgrading to that version.
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie). For details on how to document a change, see [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md#adding-changelog-entry)
diff --git a/.changes/unreleased/Breaking Changes-20240130-140550.yaml b/.changes/unreleased/Breaking Changes-20240130-140550.yaml
@@ -0,0 +1,6 @@
+kind: Breaking Changes
+body: Remove dbt-tests-adapter and dbt-postgres packages from dbt-core
+time: 2024-01-30T14:05:50.291291-08:00
+custom:
+  Author: colin-rogers-dbt
+  Issue: "9455"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,11 +11,6 @@ updates:
     schedule:
       interval: "daily"
     rebase-strategy: "disabled"
-  - package-ecosystem: "pip"
-    directory: "/plugins/postgres"
-    schedule:
-      interval: "daily"
-    rebase-strategy: "disabled"
 
   # docker dependencies
   - package-ecosystem: "docker"

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
@@ -31,7 +31,8 @@ This is the docs website code. It comes from the dbt-docs repository, and is gen
 
 ## Adapters
 
-dbt uses an adapter-plugin pattern to extend support to different databases, warehouses, query engines, etc. For testing and development purposes, the dbt-postgres plugin lives alongside the dbt-core codebase, in the [`plugins`](plugins) subdirectory. Like other adapter plugins, it is a self-contained codebase and package that builds on top of dbt-core.
+dbt uses an adapter-plugin pattern to extend support to different databases, warehouses, query engines, etc. 
+Note: dbt-postgres used to exist in dbt-core but is now in [its own repo](https://github.com/dbt-labs/dbt-postgres) 
 
 Each adapter is a mix of python, Jinja2, and SQL. The adapter code also makes heavy use of Jinja2 to wrap modular chunks of SQL functionality, define default implementations, and allow plugins to override it.
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # dbt Core Changelog
 
-- This file provides a full account of all changes to `dbt-core` and `dbt-postgres`
+- This file provides a full account of all changes to `dbt-core`
 - Changes are listed under the (pre)release in which they first appear. Subsequent releases include changes from previous releases.
 - "Breaking changes" listed under a version may require action from end users or external maintainers when upgrading to that version.
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie). For details on how to document a change, see [the contributing guide](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md#adding-changelog-entry)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ If you get stuck, we're happy to help! Drop us a line in the `#dbt-core-developm
 
 ### Notes
 
-- **Adapters:** Is your issue or proposed code change related to a specific [database adapter](https://docs.getdbt.com/docs/available-adapters)? If so, please open issues, PRs, and discussions in that adapter's repository instead. The sole exception is Postgres; the `dbt-postgres` plugin lives in this repository (`dbt-core`).
+- **Adapters:** Is your issue or proposed code change related to a specific [database adapter](https://docs.getdbt.com/docs/available-adapters)? If so, please open issues, PRs, and discussions in that adapter's repository instead.
 - **CLA:** Please note that anyone contributing code to `dbt-core` must sign the [Contributor License Agreement](https://docs.getdbt.com/docs/contributor-license-agreements). If you are unable to sign the CLA, the `dbt-core` maintainers will unfortunately be unable to merge any of your Pull Requests. We welcome you to participate in discussions, open issues, and comment on existing ones.
 - **Branches:** All pull requests from community contributors should target the `main` branch (default). If the change is needed as a patch for a minor version of dbt that has already been released (or is already a release candidate), a maintainer will backport the changes in your PR to the relevant "latest" release branch (`1.0.latest`, `1.1.latest`, ...). If an issue fix applies to a release branch, that fix should be first committed to the development branch and then to the release branch (rarely release-branch fixes may not apply to `main`).
 - **Releases**: Before releasing a new minor version of Core, we prepare a series of alphas and release candidates to allow users (especially employees of dbt Labs!) to test the new version in live environments. This is an important quality assurance step, as it exposes the new code to a wide variety of complicated deployments and can surface bugs before official release. Releases are accessible via pip, homebrew, and dbt Cloud.

diff --git a/Makefile b/Makefile
@@ -86,12 +86,12 @@ test: .env ## Runs unit tests with py and code checks against staged changes.
 	$(DOCKER_CMD) pre-commit run mypy-check --hook-stage manual | grep -v "INFO"
 
 .PHONY: integration
-integration: .env ## Runs postgres integration tests with py-integration
+integration: .env ## Runs core integration tests using postgres with py-integration
 	@\
 	$(CI_FLAGS) $(DOCKER_CMD) tox -e py-integration -- -nauto
 
 .PHONY: integration-fail-fast
-integration-fail-fast: .env ## Runs postgres integration tests with py-integration in "fail fast" mode.
+integration-fail-fast: .env ## Runs core integration tests using postgres with py-integration in "fail fast" mode.
 	@\
 	$(DOCKER_CMD) tox -e py-integration -- -x -nauto
 

diff --git a/...ostgres/macros/utils/columns_spec_ddl.sql → core/dbt/tests/__init__.py b/...ostgres/macros/utils/columns_spec_ddl.sql → core/dbt/tests/__init__.py
diff --git a/core/dbt/tests/fixtures/project.py b/core/dbt/tests/fixtures/project.py
@@ -398,7 +398,7 @@ def logs_dir(request, prefix):
 
 
 # This fixture is for customizing tests that need overrides in adapter
-# repos. Example in dbt.tests.adapter.basic.test_base.
+# repos. Example in tests.functional.adapter.basic.test_base.
 @pytest.fixture(scope="class")
 def test_config():
     return {}

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,4 +1,5 @@
 git+https://github.com/dbt-labs/dbt-adapters.git@main
+git+https://github.com/dbt-labs/dbt-postgres.git@main
 black==23.3.0
 bumpversion
 ddtrace==2.1.7

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -14,10 +14,8 @@ ARG build_for=linux/amd64
 FROM --platform=$build_for python:3.10.7-slim-bullseye as base
 
 # N.B. The refs updated automagically every release via bumpversion
-# N.B. dbt-postgres is currently found in the core codebase so a value of dbt-core@<some_version> is correct
-
 ARG [email protected]
-ARG dbt_postgres_ref=dbt-core@v1.8.0a1
+ARG dbt_postgres_ref=dbt-postgres@v1.8.0a1
 ARG [email protected]
 ARG [email protected]
 ARG [email protected]

diff --git a/docker/README.md b/docker/README.md
@@ -82,7 +82,6 @@ docker build --tag my-third-party-dbt \
 There are a few special cases worth noting:
 * The `dbt-spark` database adapter comes in three different versions named `PyHive`, `ODBC`, and the default `all`.  If you wish to overide this you can use the `--build-arg` flag with the value of `dbt_spark_version=<version_name>`.  See the [docs](https://docs.getdbt.com/reference/warehouse-profiles/spark-profile) for more information.
 
-* The `dbt-postgres` database adapter is released as part of the `dbt-core` codebase.  If you wish to overide the version used, make sure you use the gitref for `dbt-core`:
 ```
 docker build --tag my_dbt \
   --target dbt-postgres \

diff --git a/editable-requirements.txt b/editable-requirements.txt
@@ -1,3 +1 @@
 -e ./core
--e ./plugins/postgres
--e ./tests/adapter
diff --git a/plugins/postgres/MANIFEST.in b/plugins/postgres/MANIFEST.in
diff --git a/plugins/postgres/README.md b/plugins/postgres/README.md
diff --git a/plugins/postgres/dbt/__init__.py b/plugins/postgres/dbt/__init__.py
diff --git a/plugins/postgres/dbt/adapters/__init__.py b/plugins/postgres/dbt/adapters/__init__.py
diff --git a/plugins/postgres/dbt/adapters/postgres/__init__.py b/plugins/postgres/dbt/adapters/postgres/__init__.py
diff --git a/plugins/postgres/dbt/adapters/postgres/__version__.py b/plugins/postgres/dbt/adapters/postgres/__version__.py
diff --git a/plugins/postgres/dbt/adapters/postgres/column.py b/plugins/postgres/dbt/adapters/postgres/column.py