diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00afd704..4c863e49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,6 +47,8 @@ jobs: - name: Build `dbt-adapters` uses: ./.github/actions/build-hatch + with: + working-dir: "./dbt-adapters/" - name: Build `dbt-tests-adapter` uses: ./.github/actions/build-hatch diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 9c203847..b5a25d7b 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -29,6 +29,12 @@ jobs: - name: Setup `hatch` uses: ./.github/actions/setup-hatch - - name: Run code quality + - name: Run code quality for dbt-adapters shell: bash run: hatch run code-quality + working-directory: "./dbt-adapters/" + + - name: Run code quality for dbt-tests-adapter + shell: bash + run: hatch run code-quality + working-directory: "./dbt-tests-adapter/" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 828350dd..3da30b8e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -76,31 +76,26 @@ jobs: name: "Release inputs" runs-on: ubuntu-latest outputs: - working-dir: ${{ steps.release-inputs.outputs.working-dir }} run-unit-tests: ${{ steps.release-inputs.outputs.run-unit-tests }} archive-name: ${{ steps.release-inputs.outputs.archive-name }} steps: - name: "Inputs" id: release-inputs run: | - working_dir="./" run_unit_tests=true archive_name=${{ inputs.package }}-${{ inputs.version_number }}-${{ inputs.deploy-to }} if test "${{ inputs.package }}" = "dbt-tests-adapter" then - working_dir="./dbt-tests-adapter/" run_unit_tests=false fi - echo "working-dir=$working_dir" >> $GITHUB_OUTPUT echo "run-unit-tests=$run_unit_tests" >> $GITHUB_OUTPUT echo "archive-name=$archive_name" >> $GITHUB_OUTPUT - name: "[DEBUG]" run: | echo package : ${{ inputs.package }} - echo working-dir : ${{ steps.release-inputs.outputs.working-dir }} echo run-unit-tests : ${{ steps.release-inputs.outputs.run-unit-tests }} echo archive-name : ${{ steps.release-inputs.outputs.archive-name }} @@ -113,7 +108,7 @@ jobs: deploy_to: ${{ inputs.deploy-to }} nightly_release: ${{ inputs.nightly_release }} target_branch: ${{ inputs.target_branch }} - working-dir: ${{ needs.release-inputs.outputs.working-dir }} + working-dir: ./${{ inputs.package }}/ run-unit-tests: ${{ fromJSON(needs.release-inputs.outputs.run-unit-tests) }} secrets: inherit @@ -146,7 +141,7 @@ jobs: - name: "Build ${{ inputs.package }}" uses: dbt-labs/dbt-adapters/.github/actions/build-hatch@main with: - working-dir: ${{ needs.release-inputs.outputs.working-dir }} + working-dir: ./${{ inputs.package }}/ archive-name: ${{ needs.release-inputs.outputs.archive-name }} github-release: diff --git a/.github/workflows/release_prep_hatch.yml b/.github/workflows/release_prep_hatch.yml index a6105786..1960ff35 100644 --- a/.github/workflows/release_prep_hatch.yml +++ b/.github/workflows/release_prep_hatch.yml @@ -363,13 +363,13 @@ jobs: - name: "Remove Trailing Whitespace Via Pre-commit" continue-on-error: true run: | - pre-commit run trailing-whitespace --files dbt/adapters/__about__.py CHANGELOG.md .changes/* + pre-commit run trailing-whitespace --files dbt/adapters/__version__.py CHANGELOG.md .changes/* git status # this step will fail on newline errors but also correct them - name: "Removing Extra Newlines Via Pre-commit" continue-on-error: true run: | - pre-commit run end-of-file-fixer --files dbt/adapters/__about__.py CHANGELOG.md .changes/* + pre-commit run end-of-file-fixer --files dbt/adapters/__version__.py CHANGELOG.md .changes/* git status - name: "Commit & Push Changes" run: | diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b4ac615d..08807a95 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -39,6 +39,7 @@ jobs: - name: Run unit tests run: hatch run unit-tests shell: bash + working-directory: ./dbt-adapters/ - name: Publish results uses: ./.github/actions/publish-results diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b7835274..26f5c861 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,13 +27,13 @@ repos: - --target-version=py310 - --target-version=py311 - --target-version=py312 - - --force-exclude=dbt/adapters/events/adapter_types_pb2.py + - --force-exclude=dbt-adapters/src/dbt/adapters/events/adapter_types_pb2.py - repo: https://github.com/pycqa/flake8 rev: 7.1.1 hooks: - id: flake8 - exclude: dbt/adapters/events/adapter_types_pb2.py|tests/functional/ + exclude: dbt-adapters/src/dbt/adapters/events/adapter_types_pb2.py|tests/functional/ args: - --max-line-length=99 - --select=E,F,W @@ -44,7 +44,7 @@ repos: rev: v1.11.2 hooks: - id: mypy - exclude: dbt/adapters/events/adapter_types_pb2.py|dbt-tests-adapter/dbt/__init__.py + exclude: dbt-adapters/src/dbt/adapters/events/adapter_types_pb2.py|dbt-tests-adapter/dbt/__init__.py args: - --explicit-package-bases - --ignore-missing-imports diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a6e92a2..e428c03c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to `dbt-adapters` +# Contributing - [About this document](#about-this-document) - [Getting the code](#getting-the-code) @@ -7,11 +7,15 @@ - [Documentation](#documentation) - [Submitting a pull request](#submitting-a-pull-request) - ## About this document -This document is a guide for anyone interested in contributing to `dbt-adapters`. -It outlines how to install `dbt-adapters` for development, +This document is a guide for anyone interested in contributing to this repository. +This repository is a collection of packages, each with their own nuances; +however, all package share significant overlap, which is covered here. +For more information on how to contribute to a specific package, +please refer to that package's `CONTRIBUTING.md`. + +This document outlines how to install a package for development, run tests locally, update documentation, and submit pull requests. This guide assumes users are developing on a Linux or MacOS system. The following utilities are needed or will be installed in this guide: @@ -25,10 +29,9 @@ In addition to this guide, users are highly encouraged to read the `dbt-core` [CONTRIBUTING.md](https://github.com/dbt-labs/dbt-core/blob/main/CONTRIBUTING.md). Almost all information there is applicable here. - ## Getting the code -`git` is required to download, modify, and sync the `dbt-adapters` code. +`git` is required to download, modify, and sync code. There are several ways to install Git. For MacOS: - Install [Xcode](https://developer.apple.com/support/xcode/) @@ -36,7 +39,7 @@ There are several ways to install Git. For MacOS: ### External contributors -Contributors external to the `dbt-labs` GitHub organization can contribute to `dbt-adapters` +Contributors external to the `dbt-labs` GitHub organization can contribute to this repository by forking the `dbt-adapters` repository. For more on forking, check out the [GitHub docs on forking](https://help.github.com/en/articles/fork-a-repo). To contribute: @@ -58,7 +61,6 @@ Rather than forking `dbt-labs/dbt-adapters`, use `dbt-labs/dbt-adapters` directl 4. Push the new branch to `dbt-labs/dbt-adapters` 5. Open a pull request in `dbt-labs/dbt-adapters` to merge `{new-branch}` into `main` - ## Developing ### Installation @@ -67,7 +69,8 @@ Rather than forking `dbt-labs/dbt-adapters`, use `dbt-labs/dbt-adapters` directl ```shell pip install --user --upgrade pip hatch ``` -2. This step is optional, but it's recommended. Configure `hatch` to create its virtual environments in the project. Add this block to your `hatch` `config.toml` file: +2. This step is optional, but it's recommended. Configure `hatch` to create its virtual environments in the project. +Add this block to your `hatch` `config.toml` file: ```toml # MacOS: ~/Library/Application Support/hatch/config.toml [dirs.env] @@ -75,7 +78,18 @@ Rather than forking `dbt-labs/dbt-adapters`, use `dbt-labs/dbt-adapters` directl ``` This makes `hatch` create all virtual environments in the project root inside of the directory `/.hatch`, similar to `/.tox` for `tox`. It also makes it easier to add this environment as a runner in common IDEs like VSCode and PyCharm. -3. Create a `hatch` environment with all of the development dependencies and activate it: +3. Navigate to the package that you are working on. Note that because this repository is a monorepo, +you will have multiple packages, each with their own set of virtual environments. + ```shell + ls + > .github dbt-adapters dbt-tests-adapter docs third-party-stubs .changie.yml .gitignore ... + + cd dbt-adapters + + ls + > .changes src tests CHANGELOG.md CONTRIBUTING.md pyproject.toml README.md + ``` +4. Create a `hatch` environment with all of the development dependencies and activate it: ```shell hatch run setup hatch shell @@ -87,8 +101,11 @@ Rather than forking `dbt-labs/dbt-adapters`, use `dbt-labs/dbt-adapters` directl ## Testing -`dbt-adapters` contains [code quality checks](https://github.com/dbt-labs/dbt-adapters/tree/main/.pre-commit-config.yaml) and [unit tests](https://github.com/dbt-labs/dbt-adapters/tree/main/tests/unit). -While `dbt-tests-adapter` is also hosted in this repo, it requires a concrete adapter to run. +The `dbt-adapters` repo contains +[code quality checks](https://github.com/dbt-labs/dbt-adapters/tree/main/.pre-commit-config.yaml) +that will run across the entire repo. +Additionally, each package has their own unit tests and functional tests. See your particular +package's `CONTRIBUTING.md` for more information regarding these tests. ### Code quality @@ -102,7 +119,9 @@ hatch run code-quality Unit tests can be run locally without setting up a database connection: ```shell -# Note: replace $strings with valid names +# Note: +# - replace $strings with valid names +# - ensure that you are in the project directory, and not the repo root # run all unit tests hatch run unit-test diff --git a/README.md b/README.md index 7bafae02..7e9d180e 100644 --- a/README.md +++ b/README.md @@ -2,42 +2,10 @@ dbt logo

-# dbt-tests-adapter +# dbt Adapters -This package is responsible for: +This repository contains the base adapter protocols, a collection of adapter implementations, and a testing suite. +For more information about a specific package, please navigate to the appropriate page: -- defining database connection methods -- caching information from databases -- determining how relations are defined - -There are two major adapter types: base and sql - -# Directories - -## `base` - -Defines the base implementation Adapters can use to build out full functionality. - -## `sql` - -Defines a sql implementation for adapters that initially inherits the base implementation -and comes with some pre-made methods and macros that can be overwritten as needed per adapter. -(most common type of adapter.) - -# Files - -## `cache.py` - -Cached information from the database. - -## `factory.py` - -Defines how we generate adapter objects - -## `protocol.py` - -Defines various interfaces for various adapter objects. Helps mypy correctly resolve methods. - -## `reference_keys.py` - -Configures naming scheme for cache elements to be universal. +- `dbt-adapters` ([link](https://github.com/dbt-labs/dbt-adapters/dbt-adapters)) +- `dbt-tests-adapter` ([link](https://github.com/dbt-labs/dbt-adapters/dbt-tests-adapter)) diff --git a/.changes/1.0.0.md b/dbt-adapters/.changes/1.0.0.md similarity index 100% rename from .changes/1.0.0.md rename to dbt-adapters/.changes/1.0.0.md diff --git a/.changes/1.1.0.md b/dbt-adapters/.changes/1.1.0.md similarity index 100% rename from .changes/1.1.0.md rename to dbt-adapters/.changes/1.1.0.md diff --git a/.changes/1.1.1.md b/dbt-adapters/.changes/1.1.1.md similarity index 100% rename from .changes/1.1.1.md rename to dbt-adapters/.changes/1.1.1.md diff --git a/.changes/1.10.0.md b/dbt-adapters/.changes/1.10.0.md similarity index 100% rename from .changes/1.10.0.md rename to dbt-adapters/.changes/1.10.0.md diff --git a/.changes/1.10.1.md b/dbt-adapters/.changes/1.10.1.md similarity index 100% rename from .changes/1.10.1.md rename to dbt-adapters/.changes/1.10.1.md diff --git a/.changes/1.10.2.md b/dbt-adapters/.changes/1.10.2.md similarity index 100% rename from .changes/1.10.2.md rename to dbt-adapters/.changes/1.10.2.md diff --git a/.changes/1.10.3.md b/dbt-adapters/.changes/1.10.3.md similarity index 100% rename from .changes/1.10.3.md rename to dbt-adapters/.changes/1.10.3.md diff --git a/.changes/1.10.4.md b/dbt-adapters/.changes/1.10.4.md similarity index 100% rename from .changes/1.10.4.md rename to dbt-adapters/.changes/1.10.4.md diff --git a/.changes/1.11.0.md b/dbt-adapters/.changes/1.11.0.md similarity index 100% rename from .changes/1.11.0.md rename to dbt-adapters/.changes/1.11.0.md diff --git a/.changes/1.2.1.md b/dbt-adapters/.changes/1.2.1.md similarity index 100% rename from .changes/1.2.1.md rename to dbt-adapters/.changes/1.2.1.md diff --git a/.changes/1.3.0.md b/dbt-adapters/.changes/1.3.0.md similarity index 100% rename from .changes/1.3.0.md rename to dbt-adapters/.changes/1.3.0.md diff --git a/.changes/1.3.1.md b/dbt-adapters/.changes/1.3.1.md similarity index 100% rename from .changes/1.3.1.md rename to dbt-adapters/.changes/1.3.1.md diff --git a/.changes/1.3.2.md b/dbt-adapters/.changes/1.3.2.md similarity index 100% rename from .changes/1.3.2.md rename to dbt-adapters/.changes/1.3.2.md diff --git a/.changes/1.3.3.md b/dbt-adapters/.changes/1.3.3.md similarity index 100% rename from .changes/1.3.3.md rename to dbt-adapters/.changes/1.3.3.md diff --git a/.changes/1.4.0.md b/dbt-adapters/.changes/1.4.0.md similarity index 100% rename from .changes/1.4.0.md rename to dbt-adapters/.changes/1.4.0.md diff --git a/.changes/1.4.1.md b/dbt-adapters/.changes/1.4.1.md similarity index 100% rename from .changes/1.4.1.md rename to dbt-adapters/.changes/1.4.1.md diff --git a/.changes/1.5.0.md b/dbt-adapters/.changes/1.5.0.md similarity index 100% rename from .changes/1.5.0.md rename to dbt-adapters/.changes/1.5.0.md diff --git a/.changes/1.6.0.md b/dbt-adapters/.changes/1.6.0.md similarity index 100% rename from .changes/1.6.0.md rename to dbt-adapters/.changes/1.6.0.md diff --git a/.changes/1.6.1.md b/dbt-adapters/.changes/1.6.1.md similarity index 100% rename from .changes/1.6.1.md rename to dbt-adapters/.changes/1.6.1.md diff --git a/.changes/1.7.0.md b/dbt-adapters/.changes/1.7.0.md similarity index 100% rename from .changes/1.7.0.md rename to dbt-adapters/.changes/1.7.0.md diff --git a/.changes/1.7.1.md b/dbt-adapters/.changes/1.7.1.md similarity index 100% rename from .changes/1.7.1.md rename to dbt-adapters/.changes/1.7.1.md diff --git a/.changes/1.7.2.md b/dbt-adapters/.changes/1.7.2.md similarity index 100% rename from .changes/1.7.2.md rename to dbt-adapters/.changes/1.7.2.md diff --git a/.changes/1.8.0.md b/dbt-adapters/.changes/1.8.0.md similarity index 100% rename from .changes/1.8.0.md rename to dbt-adapters/.changes/1.8.0.md diff --git a/.changes/1.9.0.md b/dbt-adapters/.changes/1.9.0.md similarity index 100% rename from .changes/1.9.0.md rename to dbt-adapters/.changes/1.9.0.md diff --git a/.changes/header.tpl.md b/dbt-adapters/.changes/header.tpl.md similarity index 100% rename from .changes/header.tpl.md rename to dbt-adapters/.changes/header.tpl.md diff --git a/.changes/unreleased/.gitkeep b/dbt-adapters/.changes/unreleased/.gitkeep similarity index 100% rename from .changes/unreleased/.gitkeep rename to dbt-adapters/.changes/unreleased/.gitkeep diff --git a/dbt-adapters/.changes/unreleased/Under the Hood-20241116-181028.yaml b/dbt-adapters/.changes/unreleased/Under the Hood-20241116-181028.yaml new file mode 100644 index 00000000..e7e7e143 --- /dev/null +++ b/dbt-adapters/.changes/unreleased/Under the Hood-20241116-181028.yaml @@ -0,0 +1,6 @@ +kind: Under the Hood +body: Migrate dbt-adapters to be a subpackage within the dbt-adapters repo +time: 2024-11-16T18:10:28.184962-05:00 +custom: + Author: mikealfare + Issue: "357" diff --git a/.changie.yaml b/dbt-adapters/.changie.yaml similarity index 100% rename from .changie.yaml rename to dbt-adapters/.changie.yaml diff --git a/CHANGELOG.md b/dbt-adapters/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to dbt-adapters/CHANGELOG.md diff --git a/dbt-adapters/CONTRIBUTING.md b/dbt-adapters/CONTRIBUTING.md new file mode 100644 index 00000000..cfb4a4a4 --- /dev/null +++ b/dbt-adapters/CONTRIBUTING.md @@ -0,0 +1,32 @@ +# Contributing to `dbt-adapters` + +- [About this document](#about-this-document) +- [Developing](#developing) +- [Testing](#testing) + +## About this document + +This document covers contribution topics that specifically pertain to `dbt-adapters` (the package, not the repo). +Most topics are covered in the primary `CONTRIBUTING.md` doc; we expect this to develop over time. + +## Developing + +Make sure to always navigate to the `dbt-adapters` package subdirectory when working on this package. +Once you are in this directory, then things will behave as if this were not a monorepo. +For example, to initially create this package's virtual environment, run these commands: + +```shell +cd dbt-adapters +hatch run setup +hatch shell +``` + +You will not need to run `cd dbt-adapters` every time you run a command. +But if you use an IDE such as PyCharm, you will likely need to run it each time you open a fresh terminal. + +## Testing + +The `dbt-adapters` package is subject to the general +[code quality checks](https://github.com/dbt-labs/dbt-adapters/tree/main/.pre-commit-config.yaml). +Additionally, there are [unit tests](https://github.com/dbt-labs/dbt-adapters/tree/main/tests/unit) +that are specific to `dbt-adapters`. There are no functional tests as these would require a database. diff --git a/dbt-adapters/README.md b/dbt-adapters/README.md new file mode 100644 index 00000000..51afa7cb --- /dev/null +++ b/dbt-adapters/README.md @@ -0,0 +1,43 @@ +

+ dbt logo +

+ +# dbt-adapters + +This package is responsible for: + +- defining database connection methods +- caching information from databases +- determining how relations are defined + +There are two major adapter types: base and sql + +# Directories + +## `base` + +Defines the base implementation Adapters can use to build out full functionality. + +## `sql` + +Defines a sql implementation for adapters that initially inherits the base implementation +and comes with some pre-made methods and macros that can be overwritten as needed per adapter. +(most common type of adapter.) + +# Files + +## `cache.py` + +Cached information from the database. + +## `factory.py` + +Defines how we generate adapter objects + +## `protocol.py` + +Defines various interfaces for various adapter objects. Helps mypy correctly resolve methods. + +## `reference_keys.py` + +Configures naming scheme for cache elements to be universal. diff --git a/pyproject.toml b/dbt-adapters/pyproject.toml similarity index 88% rename from pyproject.toml rename to dbt-adapters/pyproject.toml index 7a8d1a50..c3efdce6 100644 --- a/pyproject.toml +++ b/dbt-adapters/pyproject.toml @@ -32,24 +32,26 @@ dependencies = [ "typing-extensions>=4.0,<5.0", ] [project.urls] -Homepage = "https://github.com/dbt-labs/dbt-adapters" +Homepage = "https://github.com/dbt-labs/dbt-adapters/dbt-adapters" Documentation = "https://docs.getdbt.com" -Repository = "https://github.com/dbt-labs/dbt-adapters.git" +Repository = "https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-adapters" Issues = "https://github.com/dbt-labs/dbt-adapters/issues" -Changelog = "https://github.com/dbt-labs/dbt-adapters/blob/main/CHANGELOG.md" +Changelog = "https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-adapters/CHANGELOG.md" [build-system] requires = ["hatchling"] build-backend = "hatchling.build" [tool.hatch.version] -path = "dbt/adapters/__about__.py" +path = "src/dbt/adapters/__version__.py" [tool.hatch.build.targets.sdist] -include = ["dbt/adapters", "dbt/include", "dbt/__init__.py"] +packages = ["src/dbt/adapters", "src/dbt/include", "dbt/__init__.py"] +sources = ["src"] [tool.hatch.build.targets.wheel] -include = ["dbt/adapters", "dbt/include", "dbt/__init__.py"] +packages = ["src/dbt/adapters", "src/dbt/include", "dbt/__init__.py"] +sources = ["src"] [tool.hatch.envs.default] dependencies = [ diff --git a/dbt/__init__.py b/dbt-adapters/src/dbt/__init__.py similarity index 100% rename from dbt/__init__.py rename to dbt-adapters/src/dbt/__init__.py diff --git a/dbt/adapters/__init__.py b/dbt-adapters/src/dbt/adapters/__init__.py similarity index 100% rename from dbt/adapters/__init__.py rename to dbt-adapters/src/dbt/adapters/__init__.py diff --git a/dbt/adapters/__about__.py b/dbt-adapters/src/dbt/adapters/__version__.py similarity index 100% rename from dbt/adapters/__about__.py rename to dbt-adapters/src/dbt/adapters/__version__.py diff --git a/dbt/adapters/base/README.md b/dbt-adapters/src/dbt/adapters/base/README.md similarity index 100% rename from dbt/adapters/base/README.md rename to dbt-adapters/src/dbt/adapters/base/README.md diff --git a/dbt/adapters/base/__init__.py b/dbt-adapters/src/dbt/adapters/base/__init__.py similarity index 100% rename from dbt/adapters/base/__init__.py rename to dbt-adapters/src/dbt/adapters/base/__init__.py diff --git a/dbt/adapters/base/column.py b/dbt-adapters/src/dbt/adapters/base/column.py similarity index 100% rename from dbt/adapters/base/column.py rename to dbt-adapters/src/dbt/adapters/base/column.py diff --git a/dbt/adapters/base/connections.py b/dbt-adapters/src/dbt/adapters/base/connections.py similarity index 100% rename from dbt/adapters/base/connections.py rename to dbt-adapters/src/dbt/adapters/base/connections.py diff --git a/dbt/adapters/base/impl.py b/dbt-adapters/src/dbt/adapters/base/impl.py similarity index 99% rename from dbt/adapters/base/impl.py rename to dbt-adapters/src/dbt/adapters/base/impl.py index 44817a18..c13410c9 100644 --- a/dbt/adapters/base/impl.py +++ b/dbt-adapters/src/dbt/adapters/base/impl.py @@ -1783,7 +1783,7 @@ def get_adapter_run_info(cls, config: RelationConfig) -> AdapterTrackingRelation return AdapterTrackingRelationInfo( adapter_name=adapter_name, - base_adapter_version=import_module("dbt.adapters.__about__").version, + base_adapter_version=import_module("dbt.adapters.__version__").version, adapter_version=adapter_version, model_adapter_details=cls._get_adapter_specific_run_info(config), ) diff --git a/dbt/adapters/base/meta.py b/dbt-adapters/src/dbt/adapters/base/meta.py similarity index 100% rename from dbt/adapters/base/meta.py rename to dbt-adapters/src/dbt/adapters/base/meta.py diff --git a/dbt/adapters/base/plugin.py b/dbt-adapters/src/dbt/adapters/base/plugin.py similarity index 100% rename from dbt/adapters/base/plugin.py rename to dbt-adapters/src/dbt/adapters/base/plugin.py diff --git a/dbt/adapters/base/query_headers.py b/dbt-adapters/src/dbt/adapters/base/query_headers.py similarity index 100% rename from dbt/adapters/base/query_headers.py rename to dbt-adapters/src/dbt/adapters/base/query_headers.py diff --git a/dbt/adapters/base/relation.py b/dbt-adapters/src/dbt/adapters/base/relation.py similarity index 100% rename from dbt/adapters/base/relation.py rename to dbt-adapters/src/dbt/adapters/base/relation.py diff --git a/dbt/adapters/cache.py b/dbt-adapters/src/dbt/adapters/cache.py similarity index 100% rename from dbt/adapters/cache.py rename to dbt-adapters/src/dbt/adapters/cache.py diff --git a/dbt/adapters/capability.py b/dbt-adapters/src/dbt/adapters/capability.py similarity index 100% rename from dbt/adapters/capability.py rename to dbt-adapters/src/dbt/adapters/capability.py diff --git a/tests/unit/behavior_flag_tests/__init__.py b/dbt-adapters/src/dbt/adapters/clients/__init__.py similarity index 100% rename from tests/unit/behavior_flag_tests/__init__.py rename to dbt-adapters/src/dbt/adapters/clients/__init__.py diff --git a/dbt/adapters/clients/jinja.py b/dbt-adapters/src/dbt/adapters/clients/jinja.py similarity index 100% rename from dbt/adapters/clients/jinja.py rename to dbt-adapters/src/dbt/adapters/clients/jinja.py diff --git a/tests/__init__.py b/dbt-adapters/src/dbt/adapters/contracts/__init__.py similarity index 100% rename from tests/__init__.py rename to dbt-adapters/src/dbt/adapters/contracts/__init__.py diff --git a/dbt/adapters/contracts/connection.py b/dbt-adapters/src/dbt/adapters/contracts/connection.py similarity index 100% rename from dbt/adapters/contracts/connection.py rename to dbt-adapters/src/dbt/adapters/contracts/connection.py diff --git a/dbt/adapters/contracts/macros.py b/dbt-adapters/src/dbt/adapters/contracts/macros.py similarity index 100% rename from dbt/adapters/contracts/macros.py rename to dbt-adapters/src/dbt/adapters/contracts/macros.py diff --git a/dbt/adapters/contracts/relation.py b/dbt-adapters/src/dbt/adapters/contracts/relation.py similarity index 100% rename from dbt/adapters/contracts/relation.py rename to dbt-adapters/src/dbt/adapters/contracts/relation.py diff --git a/dbt/adapters/events/README.md b/dbt-adapters/src/dbt/adapters/events/README.md similarity index 100% rename from dbt/adapters/events/README.md rename to dbt-adapters/src/dbt/adapters/events/README.md diff --git a/dbt/adapters/events/__init__.py b/dbt-adapters/src/dbt/adapters/events/__init__.py similarity index 100% rename from dbt/adapters/events/__init__.py rename to dbt-adapters/src/dbt/adapters/events/__init__.py diff --git a/dbt/adapters/events/adapter_types.proto b/dbt-adapters/src/dbt/adapters/events/adapter_types.proto similarity index 100% rename from dbt/adapters/events/adapter_types.proto rename to dbt-adapters/src/dbt/adapters/events/adapter_types.proto diff --git a/dbt/adapters/events/adapter_types_pb2.py b/dbt-adapters/src/dbt/adapters/events/adapter_types_pb2.py similarity index 100% rename from dbt/adapters/events/adapter_types_pb2.py rename to dbt-adapters/src/dbt/adapters/events/adapter_types_pb2.py diff --git a/dbt/adapters/events/base_types.py b/dbt-adapters/src/dbt/adapters/events/base_types.py similarity index 100% rename from dbt/adapters/events/base_types.py rename to dbt-adapters/src/dbt/adapters/events/base_types.py diff --git a/dbt/adapters/events/logging.py b/dbt-adapters/src/dbt/adapters/events/logging.py similarity index 100% rename from dbt/adapters/events/logging.py rename to dbt-adapters/src/dbt/adapters/events/logging.py diff --git a/dbt/adapters/events/types.py b/dbt-adapters/src/dbt/adapters/events/types.py similarity index 100% rename from dbt/adapters/events/types.py rename to dbt-adapters/src/dbt/adapters/events/types.py diff --git a/dbt/adapters/exceptions/__init__.py b/dbt-adapters/src/dbt/adapters/exceptions/__init__.py similarity index 100% rename from dbt/adapters/exceptions/__init__.py rename to dbt-adapters/src/dbt/adapters/exceptions/__init__.py diff --git a/dbt/adapters/exceptions/alias.py b/dbt-adapters/src/dbt/adapters/exceptions/alias.py similarity index 100% rename from dbt/adapters/exceptions/alias.py rename to dbt-adapters/src/dbt/adapters/exceptions/alias.py diff --git a/dbt/adapters/exceptions/cache.py b/dbt-adapters/src/dbt/adapters/exceptions/cache.py similarity index 100% rename from dbt/adapters/exceptions/cache.py rename to dbt-adapters/src/dbt/adapters/exceptions/cache.py diff --git a/dbt/adapters/exceptions/compilation.py b/dbt-adapters/src/dbt/adapters/exceptions/compilation.py similarity index 100% rename from dbt/adapters/exceptions/compilation.py rename to dbt-adapters/src/dbt/adapters/exceptions/compilation.py diff --git a/dbt/adapters/exceptions/connection.py b/dbt-adapters/src/dbt/adapters/exceptions/connection.py similarity index 100% rename from dbt/adapters/exceptions/connection.py rename to dbt-adapters/src/dbt/adapters/exceptions/connection.py diff --git a/dbt/adapters/exceptions/database.py b/dbt-adapters/src/dbt/adapters/exceptions/database.py similarity index 100% rename from dbt/adapters/exceptions/database.py rename to dbt-adapters/src/dbt/adapters/exceptions/database.py diff --git a/dbt/adapters/factory.py b/dbt-adapters/src/dbt/adapters/factory.py similarity index 100% rename from dbt/adapters/factory.py rename to dbt-adapters/src/dbt/adapters/factory.py diff --git a/dbt/adapters/protocol.py b/dbt-adapters/src/dbt/adapters/protocol.py similarity index 100% rename from dbt/adapters/protocol.py rename to dbt-adapters/src/dbt/adapters/protocol.py diff --git a/dbt/include/py.typed b/dbt-adapters/src/dbt/adapters/py.typed similarity index 100% rename from dbt/include/py.typed rename to dbt-adapters/src/dbt/adapters/py.typed diff --git a/dbt/adapters/record/__init__.py b/dbt-adapters/src/dbt/adapters/record/__init__.py similarity index 100% rename from dbt/adapters/record/__init__.py rename to dbt-adapters/src/dbt/adapters/record/__init__.py diff --git a/dbt/adapters/record/cursor/cursor.py b/dbt-adapters/src/dbt/adapters/record/cursor/cursor.py similarity index 100% rename from dbt/adapters/record/cursor/cursor.py rename to dbt-adapters/src/dbt/adapters/record/cursor/cursor.py diff --git a/dbt/adapters/record/cursor/description.py b/dbt-adapters/src/dbt/adapters/record/cursor/description.py similarity index 100% rename from dbt/adapters/record/cursor/description.py rename to dbt-adapters/src/dbt/adapters/record/cursor/description.py diff --git a/dbt/adapters/record/cursor/execute.py b/dbt-adapters/src/dbt/adapters/record/cursor/execute.py similarity index 100% rename from dbt/adapters/record/cursor/execute.py rename to dbt-adapters/src/dbt/adapters/record/cursor/execute.py diff --git a/dbt/adapters/record/cursor/fetchall.py b/dbt-adapters/src/dbt/adapters/record/cursor/fetchall.py similarity index 100% rename from dbt/adapters/record/cursor/fetchall.py rename to dbt-adapters/src/dbt/adapters/record/cursor/fetchall.py diff --git a/dbt/adapters/record/cursor/fetchmany.py b/dbt-adapters/src/dbt/adapters/record/cursor/fetchmany.py similarity index 100% rename from dbt/adapters/record/cursor/fetchmany.py rename to dbt-adapters/src/dbt/adapters/record/cursor/fetchmany.py diff --git a/dbt/adapters/record/cursor/fetchone.py b/dbt-adapters/src/dbt/adapters/record/cursor/fetchone.py similarity index 100% rename from dbt/adapters/record/cursor/fetchone.py rename to dbt-adapters/src/dbt/adapters/record/cursor/fetchone.py diff --git a/dbt/adapters/record/cursor/rowcount.py b/dbt-adapters/src/dbt/adapters/record/cursor/rowcount.py similarity index 100% rename from dbt/adapters/record/cursor/rowcount.py rename to dbt-adapters/src/dbt/adapters/record/cursor/rowcount.py diff --git a/dbt/adapters/record/handle.py b/dbt-adapters/src/dbt/adapters/record/handle.py similarity index 100% rename from dbt/adapters/record/handle.py rename to dbt-adapters/src/dbt/adapters/record/handle.py diff --git a/dbt/adapters/reference_keys.py b/dbt-adapters/src/dbt/adapters/reference_keys.py similarity index 100% rename from dbt/adapters/reference_keys.py rename to dbt-adapters/src/dbt/adapters/reference_keys.py diff --git a/dbt/adapters/relation_configs/README.md b/dbt-adapters/src/dbt/adapters/relation_configs/README.md similarity index 100% rename from dbt/adapters/relation_configs/README.md rename to dbt-adapters/src/dbt/adapters/relation_configs/README.md diff --git a/dbt/adapters/relation_configs/__init__.py b/dbt-adapters/src/dbt/adapters/relation_configs/__init__.py similarity index 100% rename from dbt/adapters/relation_configs/__init__.py rename to dbt-adapters/src/dbt/adapters/relation_configs/__init__.py diff --git a/dbt/adapters/relation_configs/config_base.py b/dbt-adapters/src/dbt/adapters/relation_configs/config_base.py similarity index 100% rename from dbt/adapters/relation_configs/config_base.py rename to dbt-adapters/src/dbt/adapters/relation_configs/config_base.py diff --git a/dbt/adapters/relation_configs/config_change.py b/dbt-adapters/src/dbt/adapters/relation_configs/config_change.py similarity index 100% rename from dbt/adapters/relation_configs/config_change.py rename to dbt-adapters/src/dbt/adapters/relation_configs/config_change.py diff --git a/dbt/adapters/relation_configs/config_validation.py b/dbt-adapters/src/dbt/adapters/relation_configs/config_validation.py similarity index 100% rename from dbt/adapters/relation_configs/config_validation.py rename to dbt-adapters/src/dbt/adapters/relation_configs/config_validation.py diff --git a/dbt/adapters/sql/__init__.py b/dbt-adapters/src/dbt/adapters/sql/__init__.py similarity index 100% rename from dbt/adapters/sql/__init__.py rename to dbt-adapters/src/dbt/adapters/sql/__init__.py diff --git a/dbt/adapters/sql/connections.py b/dbt-adapters/src/dbt/adapters/sql/connections.py similarity index 100% rename from dbt/adapters/sql/connections.py rename to dbt-adapters/src/dbt/adapters/sql/connections.py diff --git a/dbt/adapters/sql/impl.py b/dbt-adapters/src/dbt/adapters/sql/impl.py similarity index 100% rename from dbt/adapters/sql/impl.py rename to dbt-adapters/src/dbt/adapters/sql/impl.py diff --git a/dbt/adapters/utils.py b/dbt-adapters/src/dbt/adapters/utils.py similarity index 100% rename from dbt/adapters/utils.py rename to dbt-adapters/src/dbt/adapters/utils.py diff --git a/dbt/include/__init__.py b/dbt-adapters/src/dbt/include/__init__.py similarity index 100% rename from dbt/include/__init__.py rename to dbt-adapters/src/dbt/include/__init__.py diff --git a/dbt/include/global_project/__init__.py b/dbt-adapters/src/dbt/include/global_project/__init__.py similarity index 100% rename from dbt/include/global_project/__init__.py rename to dbt-adapters/src/dbt/include/global_project/__init__.py diff --git a/dbt/include/global_project/dbt_project.yml b/dbt-adapters/src/dbt/include/global_project/dbt_project.yml similarity index 100% rename from dbt/include/global_project/dbt_project.yml rename to dbt-adapters/src/dbt/include/global_project/dbt_project.yml diff --git a/dbt/include/global_project/docs/overview.md b/dbt-adapters/src/dbt/include/global_project/docs/overview.md similarity index 100% rename from dbt/include/global_project/docs/overview.md rename to dbt-adapters/src/dbt/include/global_project/docs/overview.md diff --git a/dbt/include/global_project/macros/adapters/apply_grants.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/apply_grants.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/apply_grants.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/apply_grants.sql diff --git a/dbt/include/global_project/macros/adapters/columns.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/columns.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/columns.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/columns.sql diff --git a/dbt/include/global_project/macros/adapters/freshness.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/freshness.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/freshness.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/freshness.sql diff --git a/dbt/include/global_project/macros/adapters/indexes.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/indexes.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/indexes.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/indexes.sql diff --git a/dbt/include/global_project/macros/adapters/metadata.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/metadata.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/metadata.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/metadata.sql diff --git a/dbt/include/global_project/macros/adapters/persist_docs.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/persist_docs.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/persist_docs.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/persist_docs.sql diff --git a/dbt/include/global_project/macros/adapters/relation.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/relation.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/relation.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/relation.sql diff --git a/dbt/include/global_project/macros/adapters/schema.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/schema.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/schema.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/schema.sql diff --git a/dbt/include/global_project/macros/adapters/show.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/show.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/show.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/show.sql diff --git a/dbt/include/global_project/macros/adapters/timestamps.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/timestamps.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/timestamps.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/timestamps.sql diff --git a/dbt/include/global_project/macros/adapters/validate_sql.sql b/dbt-adapters/src/dbt/include/global_project/macros/adapters/validate_sql.sql similarity index 100% rename from dbt/include/global_project/macros/adapters/validate_sql.sql rename to dbt-adapters/src/dbt/include/global_project/macros/adapters/validate_sql.sql diff --git a/dbt/include/global_project/macros/etc/datetime.sql b/dbt-adapters/src/dbt/include/global_project/macros/etc/datetime.sql similarity index 100% rename from dbt/include/global_project/macros/etc/datetime.sql rename to dbt-adapters/src/dbt/include/global_project/macros/etc/datetime.sql diff --git a/dbt/include/global_project/macros/etc/statement.sql b/dbt-adapters/src/dbt/include/global_project/macros/etc/statement.sql similarity index 100% rename from dbt/include/global_project/macros/etc/statement.sql rename to dbt-adapters/src/dbt/include/global_project/macros/etc/statement.sql diff --git a/dbt/include/global_project/macros/generic_test_sql/accepted_values.sql b/dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/accepted_values.sql similarity index 100% rename from dbt/include/global_project/macros/generic_test_sql/accepted_values.sql rename to dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/accepted_values.sql diff --git a/dbt/include/global_project/macros/generic_test_sql/not_null.sql b/dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/not_null.sql similarity index 100% rename from dbt/include/global_project/macros/generic_test_sql/not_null.sql rename to dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/not_null.sql diff --git a/dbt/include/global_project/macros/generic_test_sql/relationships.sql b/dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/relationships.sql similarity index 100% rename from dbt/include/global_project/macros/generic_test_sql/relationships.sql rename to dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/relationships.sql diff --git a/dbt/include/global_project/macros/generic_test_sql/unique.sql b/dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/unique.sql similarity index 100% rename from dbt/include/global_project/macros/generic_test_sql/unique.sql rename to dbt-adapters/src/dbt/include/global_project/macros/generic_test_sql/unique.sql diff --git a/dbt/include/global_project/macros/get_custom_name/get_custom_alias.sql b/dbt-adapters/src/dbt/include/global_project/macros/get_custom_name/get_custom_alias.sql similarity index 100% rename from dbt/include/global_project/macros/get_custom_name/get_custom_alias.sql rename to dbt-adapters/src/dbt/include/global_project/macros/get_custom_name/get_custom_alias.sql diff --git a/dbt/include/global_project/macros/get_custom_name/get_custom_database.sql b/dbt-adapters/src/dbt/include/global_project/macros/get_custom_name/get_custom_database.sql similarity index 100% rename from dbt/include/global_project/macros/get_custom_name/get_custom_database.sql rename to dbt-adapters/src/dbt/include/global_project/macros/get_custom_name/get_custom_database.sql diff --git a/dbt/include/global_project/macros/get_custom_name/get_custom_schema.sql b/dbt-adapters/src/dbt/include/global_project/macros/get_custom_name/get_custom_schema.sql similarity index 100% rename from dbt/include/global_project/macros/get_custom_name/get_custom_schema.sql rename to dbt-adapters/src/dbt/include/global_project/macros/get_custom_name/get_custom_schema.sql diff --git a/dbt/include/global_project/macros/materializations/configs.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/configs.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/configs.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/configs.sql diff --git a/dbt/include/global_project/macros/materializations/hooks.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/hooks.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/hooks.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/hooks.sql diff --git a/dbt/include/global_project/macros/materializations/models/clone/can_clone_table.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/clone/can_clone_table.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/clone/can_clone_table.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/clone/can_clone_table.sql diff --git a/dbt/include/global_project/macros/materializations/models/clone/clone.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/clone/clone.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/clone/clone.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/clone/clone.sql diff --git a/dbt/include/global_project/macros/materializations/models/clone/create_or_replace_clone.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/clone/create_or_replace_clone.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/clone/create_or_replace_clone.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/clone/create_or_replace_clone.sql diff --git a/dbt/include/global_project/macros/materializations/models/incremental/column_helpers.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/column_helpers.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/incremental/column_helpers.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/column_helpers.sql diff --git a/dbt/include/global_project/macros/materializations/models/incremental/incremental.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/incremental.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/incremental/incremental.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/incremental.sql diff --git a/dbt/include/global_project/macros/materializations/models/incremental/is_incremental.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/is_incremental.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/incremental/is_incremental.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/is_incremental.sql diff --git a/dbt/include/global_project/macros/materializations/models/incremental/merge.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/merge.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/incremental/merge.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/merge.sql diff --git a/dbt/include/global_project/macros/materializations/models/incremental/on_schema_change.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/on_schema_change.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/incremental/on_schema_change.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/on_schema_change.sql diff --git a/dbt/include/global_project/macros/materializations/models/incremental/strategies.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/strategies.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/incremental/strategies.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/incremental/strategies.sql diff --git a/dbt/include/global_project/macros/materializations/models/materialized_view.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/materialized_view.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/materialized_view.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/materialized_view.sql diff --git a/dbt/include/global_project/macros/materializations/models/table.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/table.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/table.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/table.sql diff --git a/dbt/include/global_project/macros/materializations/models/view.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/models/view.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/models/view.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/models/view.sql diff --git a/dbt/include/global_project/macros/materializations/seeds/helpers.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/seeds/helpers.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/seeds/helpers.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/seeds/helpers.sql diff --git a/dbt/include/global_project/macros/materializations/seeds/seed.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/seeds/seed.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/seeds/seed.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/seeds/seed.sql diff --git a/dbt/include/global_project/macros/materializations/snapshots/helpers.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/helpers.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/snapshots/helpers.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/helpers.sql diff --git a/dbt/include/global_project/macros/materializations/snapshots/snapshot.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/snapshot.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/snapshots/snapshot.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/snapshot.sql diff --git a/dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql diff --git a/dbt/include/global_project/macros/materializations/snapshots/strategies.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/strategies.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/snapshots/strategies.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/snapshots/strategies.sql diff --git a/dbt/include/global_project/macros/materializations/tests/helpers.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/helpers.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/tests/helpers.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/helpers.sql diff --git a/dbt/include/global_project/macros/materializations/tests/test.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/test.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/tests/test.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/test.sql diff --git a/dbt/include/global_project/macros/materializations/tests/unit.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/unit.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/tests/unit.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/unit.sql diff --git a/dbt/include/global_project/macros/materializations/tests/where_subquery.sql b/dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/where_subquery.sql similarity index 100% rename from dbt/include/global_project/macros/materializations/tests/where_subquery.sql rename to dbt-adapters/src/dbt/include/global_project/macros/materializations/tests/where_subquery.sql diff --git a/dbt/include/global_project/macros/python_model/python.sql b/dbt-adapters/src/dbt/include/global_project/macros/python_model/python.sql similarity index 100% rename from dbt/include/global_project/macros/python_model/python.sql rename to dbt-adapters/src/dbt/include/global_project/macros/python_model/python.sql diff --git a/dbt/include/global_project/macros/relations/column/columns_spec_ddl.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/column/columns_spec_ddl.sql similarity index 100% rename from dbt/include/global_project/macros/relations/column/columns_spec_ddl.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/column/columns_spec_ddl.sql diff --git a/dbt/include/global_project/macros/relations/create.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/create.sql similarity index 100% rename from dbt/include/global_project/macros/relations/create.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/create.sql diff --git a/dbt/include/global_project/macros/relations/create_backup.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/create_backup.sql similarity index 100% rename from dbt/include/global_project/macros/relations/create_backup.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/create_backup.sql diff --git a/dbt/include/global_project/macros/relations/create_intermediate.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/create_intermediate.sql similarity index 100% rename from dbt/include/global_project/macros/relations/create_intermediate.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/create_intermediate.sql diff --git a/dbt/include/global_project/macros/relations/drop.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/drop.sql similarity index 100% rename from dbt/include/global_project/macros/relations/drop.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/drop.sql diff --git a/dbt/include/global_project/macros/relations/drop_backup.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/drop_backup.sql similarity index 100% rename from dbt/include/global_project/macros/relations/drop_backup.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/drop_backup.sql diff --git a/dbt/include/global_project/macros/relations/materialized_view/alter.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/alter.sql similarity index 100% rename from dbt/include/global_project/macros/relations/materialized_view/alter.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/alter.sql diff --git a/dbt/include/global_project/macros/relations/materialized_view/create.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/create.sql similarity index 100% rename from dbt/include/global_project/macros/relations/materialized_view/create.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/create.sql diff --git a/dbt/include/global_project/macros/relations/materialized_view/drop.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/drop.sql similarity index 100% rename from dbt/include/global_project/macros/relations/materialized_view/drop.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/drop.sql diff --git a/dbt/include/global_project/macros/relations/materialized_view/refresh.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/refresh.sql similarity index 100% rename from dbt/include/global_project/macros/relations/materialized_view/refresh.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/refresh.sql diff --git a/dbt/include/global_project/macros/relations/materialized_view/rename.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/rename.sql similarity index 100% rename from dbt/include/global_project/macros/relations/materialized_view/rename.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/rename.sql diff --git a/dbt/include/global_project/macros/relations/materialized_view/replace.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/replace.sql similarity index 100% rename from dbt/include/global_project/macros/relations/materialized_view/replace.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/materialized_view/replace.sql diff --git a/dbt/include/global_project/macros/relations/rename.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/rename.sql similarity index 100% rename from dbt/include/global_project/macros/relations/rename.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/rename.sql diff --git a/dbt/include/global_project/macros/relations/rename_intermediate.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/rename_intermediate.sql similarity index 100% rename from dbt/include/global_project/macros/relations/rename_intermediate.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/rename_intermediate.sql diff --git a/dbt/include/global_project/macros/relations/replace.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/replace.sql similarity index 100% rename from dbt/include/global_project/macros/relations/replace.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/replace.sql diff --git a/dbt/include/global_project/macros/relations/schema.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/schema.sql similarity index 100% rename from dbt/include/global_project/macros/relations/schema.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/schema.sql diff --git a/dbt/include/global_project/macros/relations/table/create.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/table/create.sql similarity index 100% rename from dbt/include/global_project/macros/relations/table/create.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/table/create.sql diff --git a/dbt/include/global_project/macros/relations/table/drop.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/table/drop.sql similarity index 100% rename from dbt/include/global_project/macros/relations/table/drop.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/table/drop.sql diff --git a/dbt/include/global_project/macros/relations/table/rename.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/table/rename.sql similarity index 100% rename from dbt/include/global_project/macros/relations/table/rename.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/table/rename.sql diff --git a/dbt/include/global_project/macros/relations/table/replace.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/table/replace.sql similarity index 100% rename from dbt/include/global_project/macros/relations/table/replace.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/table/replace.sql diff --git a/dbt/include/global_project/macros/relations/view/create.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/view/create.sql similarity index 100% rename from dbt/include/global_project/macros/relations/view/create.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/view/create.sql diff --git a/dbt/include/global_project/macros/relations/view/drop.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/view/drop.sql similarity index 100% rename from dbt/include/global_project/macros/relations/view/drop.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/view/drop.sql diff --git a/dbt/include/global_project/macros/relations/view/rename.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/view/rename.sql similarity index 100% rename from dbt/include/global_project/macros/relations/view/rename.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/view/rename.sql diff --git a/dbt/include/global_project/macros/relations/view/replace.sql b/dbt-adapters/src/dbt/include/global_project/macros/relations/view/replace.sql similarity index 100% rename from dbt/include/global_project/macros/relations/view/replace.sql rename to dbt-adapters/src/dbt/include/global_project/macros/relations/view/replace.sql diff --git a/dbt/include/global_project/macros/unit_test_sql/get_fixture_sql.sql b/dbt-adapters/src/dbt/include/global_project/macros/unit_test_sql/get_fixture_sql.sql similarity index 100% rename from dbt/include/global_project/macros/unit_test_sql/get_fixture_sql.sql rename to dbt-adapters/src/dbt/include/global_project/macros/unit_test_sql/get_fixture_sql.sql diff --git a/dbt/include/global_project/macros/utils/any_value.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/any_value.sql similarity index 100% rename from dbt/include/global_project/macros/utils/any_value.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/any_value.sql diff --git a/dbt/include/global_project/macros/utils/array_append.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/array_append.sql similarity index 100% rename from dbt/include/global_project/macros/utils/array_append.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/array_append.sql diff --git a/dbt/include/global_project/macros/utils/array_concat.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/array_concat.sql similarity index 100% rename from dbt/include/global_project/macros/utils/array_concat.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/array_concat.sql diff --git a/dbt/include/global_project/macros/utils/array_construct.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/array_construct.sql similarity index 100% rename from dbt/include/global_project/macros/utils/array_construct.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/array_construct.sql diff --git a/dbt/include/global_project/macros/utils/bool_or.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/bool_or.sql similarity index 100% rename from dbt/include/global_project/macros/utils/bool_or.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/bool_or.sql diff --git a/dbt/include/global_project/macros/utils/cast.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/cast.sql similarity index 100% rename from dbt/include/global_project/macros/utils/cast.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/cast.sql diff --git a/dbt/include/global_project/macros/utils/cast_bool_to_text.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/cast_bool_to_text.sql similarity index 100% rename from dbt/include/global_project/macros/utils/cast_bool_to_text.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/cast_bool_to_text.sql diff --git a/dbt/include/global_project/macros/utils/concat.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/concat.sql similarity index 100% rename from dbt/include/global_project/macros/utils/concat.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/concat.sql diff --git a/dbt/include/global_project/macros/utils/data_types.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/data_types.sql similarity index 100% rename from dbt/include/global_project/macros/utils/data_types.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/data_types.sql diff --git a/dbt/include/global_project/macros/utils/date.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/date.sql similarity index 100% rename from dbt/include/global_project/macros/utils/date.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/date.sql diff --git a/dbt/include/global_project/macros/utils/date_spine.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/date_spine.sql similarity index 100% rename from dbt/include/global_project/macros/utils/date_spine.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/date_spine.sql diff --git a/dbt/include/global_project/macros/utils/date_trunc.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/date_trunc.sql similarity index 100% rename from dbt/include/global_project/macros/utils/date_trunc.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/date_trunc.sql diff --git a/dbt/include/global_project/macros/utils/dateadd.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/dateadd.sql similarity index 100% rename from dbt/include/global_project/macros/utils/dateadd.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/dateadd.sql diff --git a/dbt/include/global_project/macros/utils/datediff.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/datediff.sql similarity index 100% rename from dbt/include/global_project/macros/utils/datediff.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/datediff.sql diff --git a/dbt/include/global_project/macros/utils/escape_single_quotes.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/escape_single_quotes.sql similarity index 100% rename from dbt/include/global_project/macros/utils/escape_single_quotes.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/escape_single_quotes.sql diff --git a/dbt/include/global_project/macros/utils/except.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/except.sql similarity index 100% rename from dbt/include/global_project/macros/utils/except.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/except.sql diff --git a/dbt/include/global_project/macros/utils/generate_series.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/generate_series.sql similarity index 100% rename from dbt/include/global_project/macros/utils/generate_series.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/generate_series.sql diff --git a/dbt/include/global_project/macros/utils/hash.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/hash.sql similarity index 100% rename from dbt/include/global_project/macros/utils/hash.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/hash.sql diff --git a/dbt/include/global_project/macros/utils/intersect.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/intersect.sql similarity index 100% rename from dbt/include/global_project/macros/utils/intersect.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/intersect.sql diff --git a/dbt/include/global_project/macros/utils/last_day.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/last_day.sql similarity index 100% rename from dbt/include/global_project/macros/utils/last_day.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/last_day.sql diff --git a/dbt/include/global_project/macros/utils/length.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/length.sql similarity index 100% rename from dbt/include/global_project/macros/utils/length.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/length.sql diff --git a/dbt/include/global_project/macros/utils/listagg.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/listagg.sql similarity index 100% rename from dbt/include/global_project/macros/utils/listagg.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/listagg.sql diff --git a/dbt/include/global_project/macros/utils/literal.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/literal.sql similarity index 100% rename from dbt/include/global_project/macros/utils/literal.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/literal.sql diff --git a/dbt/include/global_project/macros/utils/position.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/position.sql similarity index 100% rename from dbt/include/global_project/macros/utils/position.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/position.sql diff --git a/dbt/include/global_project/macros/utils/replace.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/replace.sql similarity index 100% rename from dbt/include/global_project/macros/utils/replace.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/replace.sql diff --git a/dbt/include/global_project/macros/utils/right.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/right.sql similarity index 100% rename from dbt/include/global_project/macros/utils/right.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/right.sql diff --git a/dbt/include/global_project/macros/utils/safe_cast.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/safe_cast.sql similarity index 100% rename from dbt/include/global_project/macros/utils/safe_cast.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/safe_cast.sql diff --git a/dbt/include/global_project/macros/utils/split_part.sql b/dbt-adapters/src/dbt/include/global_project/macros/utils/split_part.sql similarity index 100% rename from dbt/include/global_project/macros/utils/split_part.sql rename to dbt-adapters/src/dbt/include/global_project/macros/utils/split_part.sql diff --git a/dbt/include/global_project/tests/generic/builtin.sql b/dbt-adapters/src/dbt/include/global_project/tests/generic/builtin.sql similarity index 100% rename from dbt/include/global_project/tests/generic/builtin.sql rename to dbt-adapters/src/dbt/include/global_project/tests/generic/builtin.sql diff --git a/dbt/adapters/py.typed b/dbt-adapters/src/dbt/include/py.typed similarity index 100% rename from dbt/adapters/py.typed rename to dbt-adapters/src/dbt/include/py.typed diff --git a/dbt/adapters/contracts/__init__.py b/dbt-adapters/tests/__init__.py similarity index 100% rename from dbt/adapters/contracts/__init__.py rename to dbt-adapters/tests/__init__.py diff --git a/dbt/adapters/clients/__init__.py b/dbt-adapters/tests/unit/behavior_flag_tests/__init__.py similarity index 100% rename from dbt/adapters/clients/__init__.py rename to dbt-adapters/tests/unit/behavior_flag_tests/__init__.py diff --git a/tests/unit/behavior_flag_tests/test_behavior_flags.py b/dbt-adapters/tests/unit/behavior_flag_tests/test_behavior_flags.py similarity index 100% rename from tests/unit/behavior_flag_tests/test_behavior_flags.py rename to dbt-adapters/tests/unit/behavior_flag_tests/test_behavior_flags.py diff --git a/tests/unit/behavior_flag_tests/test_empty_project.py b/dbt-adapters/tests/unit/behavior_flag_tests/test_empty_project.py similarity index 100% rename from tests/unit/behavior_flag_tests/test_empty_project.py rename to dbt-adapters/tests/unit/behavior_flag_tests/test_empty_project.py diff --git a/tests/unit/conftest.py b/dbt-adapters/tests/unit/conftest.py similarity index 100% rename from tests/unit/conftest.py rename to dbt-adapters/tests/unit/conftest.py diff --git a/tests/unit/fixtures/__init__.py b/dbt-adapters/tests/unit/fixtures/__init__.py similarity index 100% rename from tests/unit/fixtures/__init__.py rename to dbt-adapters/tests/unit/fixtures/__init__.py diff --git a/tests/unit/fixtures/adapter.py b/dbt-adapters/tests/unit/fixtures/adapter.py similarity index 100% rename from tests/unit/fixtures/adapter.py rename to dbt-adapters/tests/unit/fixtures/adapter.py diff --git a/tests/unit/fixtures/connection_manager.py b/dbt-adapters/tests/unit/fixtures/connection_manager.py similarity index 100% rename from tests/unit/fixtures/connection_manager.py rename to dbt-adapters/tests/unit/fixtures/connection_manager.py diff --git a/tests/unit/fixtures/credentials.py b/dbt-adapters/tests/unit/fixtures/credentials.py similarity index 100% rename from tests/unit/fixtures/credentials.py rename to dbt-adapters/tests/unit/fixtures/credentials.py diff --git a/tests/unit/test_adapter_factory.py b/dbt-adapters/tests/unit/test_adapter_factory.py similarity index 100% rename from tests/unit/test_adapter_factory.py rename to dbt-adapters/tests/unit/test_adapter_factory.py diff --git a/tests/unit/test_adapter_telemetry.py b/dbt-adapters/tests/unit/test_adapter_telemetry.py similarity index 77% rename from tests/unit/test_adapter_telemetry.py rename to dbt-adapters/tests/unit/test_adapter_telemetry.py index 1d5c4911..12683fcb 100644 --- a/tests/unit/test_adapter_telemetry.py +++ b/dbt-adapters/tests/unit/test_adapter_telemetry.py @@ -1,4 +1,4 @@ -import dbt.adapters.__about__ +import dbt.adapters.__version__ from dbt.adapters.base.impl import BaseAdapter from dbt.adapters.base.relation import AdapterTrackingRelationInfo @@ -8,7 +8,7 @@ def test_telemetry_returns(): res = BaseAdapter.get_adapter_run_info({}) assert res.adapter_name == "base" - assert res.base_adapter_version == dbt.adapters.__about__.version + assert res.base_adapter_version == dbt.adapters.__version__.version assert res.adapter_version == "" assert res.model_adapter_details == {} diff --git a/tests/unit/test_base_adapter.py b/dbt-adapters/tests/unit/test_base_adapter.py similarity index 100% rename from tests/unit/test_base_adapter.py rename to dbt-adapters/tests/unit/test_base_adapter.py diff --git a/tests/unit/test_cache.py b/dbt-adapters/tests/unit/test_cache.py similarity index 100% rename from tests/unit/test_cache.py rename to dbt-adapters/tests/unit/test_cache.py diff --git a/tests/unit/test_column.py b/dbt-adapters/tests/unit/test_column.py similarity index 100% rename from tests/unit/test_column.py rename to dbt-adapters/tests/unit/test_column.py diff --git a/tests/unit/test_events.py b/dbt-adapters/tests/unit/test_events.py similarity index 100% rename from tests/unit/test_events.py rename to dbt-adapters/tests/unit/test_events.py diff --git a/tests/unit/test_relation.py b/dbt-adapters/tests/unit/test_relation.py similarity index 100% rename from tests/unit/test_relation.py rename to dbt-adapters/tests/unit/test_relation.py diff --git a/tests/unit/test_sql_result.py b/dbt-adapters/tests/unit/test_sql_result.py similarity index 100% rename from tests/unit/test_sql_result.py rename to dbt-adapters/tests/unit/test_sql_result.py