Bumping version to 1.0.0rc1 (#4234)

* Bumping version to 1.0.0rc1

* Update changelog

* Add Dockerfile to bumpversion, update reqs

Co-authored-by: Github Build Bot <buildbot@fishtownanalytics.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.0b2
+current_version = 1.0.0rc1
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)
@@ -34,17 +34,6 @@ first_value = 1
 
 [bumpversion:file:plugins/postgres/setup.py]
 
-[bumpversion:file:plugins/redshift/setup.py]
-
-[bumpversion:file:plugins/snowflake/setup.py]
-
-[bumpversion:file:plugins/bigquery/setup.py]
-
 [bumpversion:file:plugins/postgres/dbt/adapters/postgres/__version__.py]
 
-[bumpversion:file:plugins/redshift/dbt/adapters/redshift/__version__.py]
-
-[bumpversion:file:plugins/snowflake/dbt/adapters/snowflake/__version__.py]
-
-[bumpversion:file:plugins/bigquery/dbt/adapters/bigquery/__version__.py]
-
+[bumpversion:file:docker/requirements/requirements.txt]

.github/ISSUE_TEMPLATE/beta-minor-version-release.md

@@ -1,27 +0,0 @@
----
-name: Beta minor version release
-about: Creates a tracking checklist of items for a Beta minor version release
-title: "[Tracking] v#.##.#B# release "
-labels: 'release'
-assignees: ''
-
----
-
-### Release Core
-- [ ] [Engineering] Follow [dbt-release workflow](https://www.notion.so/dbtlabs/Releasing-b97c5ea9a02949e79e81db3566bbc8ef#03ff37da697d4d8ba63d24fae1bfa817) 
-- [ ] [Engineering] Verify new release branch is created in the repo
-- [ ] [Product] Finalize migration guide (next.docs.getdbt.com)
-
-### Release Cloud
-- [ ] [Engineering] Create a platform issue to update dbt Cloud and verify it is completed. [Example issue](https://github.com/dbt-labs/dbt-cloud/issues/3481)
-- [ ] [Engineering] Determine if schemas have changed. If so, generate new schemas and push to schemas.getdbt.com
-
-### Announce
-- [ ] [Product] Announce in dbt Slack
-
-### Post-release
-- [ ] [Engineering] [Bump plugin versions](https://www.notion.so/dbtlabs/Releasing-b97c5ea9a02949e79e81db3566bbc8ef#f01854e8da3641179fbcbe505bdf515c) (dbt-spark + dbt-presto), add compatibility as needed
-   - [ ]  [Spark](https://github.com/dbt-labs/dbt-spark) 
-   - [ ]  [Presto](https://github.com/dbt-labs/dbt-presto)
-- [ ] [Engineering] Create a platform issue to update dbt-spark versions to dbt Cloud. [Example issue](https://github.com/dbt-labs/dbt-cloud/issues/3481)
-- [ ] [Engineering] Create an epic for the RC release

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,85 @@
+name: 🐞 Bug
+description: Report a bug or an issue you've found with dbt
+title: "[Bug] <title>"
+labels: ["bug", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: false
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: |
+        If applicable, log output to help explain your problem.
+      render: shell
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **Python**: 3.7.2 (`python --version`)
+          - **dbt**: 0.21.0 (`dbt --version`)
+      value: |
+        - OS:
+        - Python:
+        - dbt:
+      render: markdown
+    validations:
+      required: false
+  - type: dropdown
+    id: database
+    attributes:
+      label: What database are you using dbt with?
+      multiple: true
+      options:
+        - postgres
+        - redshift
+        - snowflake
+        - bigquery
+        - other (mention it in "Additional Context")
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional Context
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,41 +0,0 @@
----
-name: Bug report
-about: Report a bug or an issue you've found with dbt
-title: ''
-labels: bug, triage
-assignees: ''
-
----
-
-### Describe the bug
-A clear and concise description of what the bug is. What command did you run? What happened?
-
-### Steps To Reproduce
-In as much detail as possible, please provide steps to reproduce the issue. Sample data that triggers the issue, example model code, etc is all very helpful here.
-
-### Expected behavior
-A clear and concise description of what you expected to happen.
-
-### Screenshots and log output
-If applicable, add screenshots or log output to help explain your problem.
-
-### System information
-**Which database are you using dbt with?**
-- [ ] postgres
-- [ ] redshift
-- [ ] bigquery
-- [ ] snowflake
-- [ ] other (specify: ____________)
-
-
-**The output of `dbt --version`:**
-```
-<output goes here>
-```
-
-**The operating system you're using:**
-
-**The output of `python --version`:**
-
-### Additional context
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,16 @@
+contact_links:
+  - name: Create an issue for dbt-redshift
+    url: https://github.com/dbt-labs/dbt-redshift/issues/new/choose
+    about: Report a bug or request a feature for dbt-redshift
+  - name: Create an issue for dbt-bigquery
+    url: https://github.com/dbt-labs/dbt-bigquery/issues/new/choose
+    about: Report a bug or request a feature for dbt-bigquery
+  - name: Create an issue for dbt-snowflake
+    url: https://github.com/dbt-labs/dbt-snowflake/issues/new/choose
+    about: Report a bug or request a feature for dbt-snowflake
+  - name: Ask a question or get support
+    url: https://docs.getdbt.com/docs/guides/getting-help
+    about: Ask a question or request support
+  - name: Questions on Stack Overflow
+    url: https://stackoverflow.com/questions/tagged/dbt
+    about: Look at questions/answers at Stack Overflow

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,49 @@
+name: ✨ Feature
+description: Suggest an idea for dbt
+title: "[Feature] <title>"
+labels: ["enhancement", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature requests!
+  - type: checkboxes
+    attributes:
+      label: Is there an existing feature request for this?
+      description: Please search to see if an issue already exists for the feature you would like.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Describe the Feature
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Who will this benefit?
+      description: |
+        What kind of use case will this feature be useful for? Please be specific and provide examples, this will help us prioritize properly.
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Are you interested in contributing this feature?
+      description: Let us know if you want to write some code, and how we can help.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the feature you are suggesting!
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for dbt
-title: ''
-labels: enhancement, triage
-assignees: ''
-
----
-
-### Describe the feature
-A clear and concise description of what you want to happen.
-
-### Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
-
-### Additional context
-Is this feature database-specific? Which database(s) is/are relevant? Please include any other relevant context here.
-
-### Who will this benefit?
-What kind of use case will this feature be useful for? Please be specific and provide examples, this will help us prioritize properly.
-
-### Are you interested in contributing this feature?
-Let us know if you want to write some code, and how we can help.

.github/ISSUE_TEMPLATE/final-minor-version-release.md

@@ -1,28 +0,0 @@
----
-name: Final minor version release
-about: Creates a tracking checklist of items for a final minor version release
-title: "[Tracking] v#.##.# final release "
-labels: 'release'
-assignees: ''
-
----
-
-### Release Core
-- [ ] [Engineering] Verify all necessary changes exist on the release branch
-- [ ] [Engineering] Follow [dbt-release workflow](https://www.notion.so/dbtlabs/Releasing-b97c5ea9a02949e79e81db3566bbc8ef#03ff37da697d4d8ba63d24fae1bfa817) 
-- [ ] [Product] Merge `next` into `current` for docs.getdbt.com
-
-### Release Cloud
-- [ ] [Engineering] Create a platform issue to update dbt Cloud and verify it is completed. [Example issue](https://github.com/dbt-labs/dbt-cloud/issues/3481)
-- [ ] [Engineering] Determine if schemas have changed. If so, generate new schemas and push to schemas.getdbt.com
-
-### Announce
-- [ ] [Product] Update discourse
-- [ ] [Product] Announce in dbt Slack
-
-### Post-release
-- [ ] [Engineering] [Bump plugin versions](https://www.notion.so/dbtlabs/Releasing-b97c5ea9a02949e79e81db3566bbc8ef#f01854e8da3641179fbcbe505bdf515c) (dbt-spark + dbt-presto), add compatibility as needed
-   - [ ]  [Spark](https://github.com/dbt-labs/dbt-spark) 
-   - [ ]  [Presto](https://github.com/dbt-labs/dbt-presto)
-- [ ] [Engineering] Create a platform issue to update dbt-spark versions to dbt Cloud. [Example issue](https://github.com/dbt-labs/dbt-cloud/issues/3481)
-- [ ] [Product] Release new version of dbt-utils with new dbt version compatibility. If there are breaking changes requiring a minor version, plan upgrades of other packages that depend on dbt-utils.

.github/ISSUE_TEMPLATE/rc-minor-version-release copy.md

@@ -1,29 +0,0 @@
----
-name: RC minor version release
-about: Creates a tracking checklist of items for a RC minor version release
-title: "[Tracking] v#.##.#RC# release "
-labels: 'release'
-assignees: ''
-
----
-
-### Release Core
-- [ ] [Engineering] Verify all necessary changes exist on the release branch
-- [ ] [Engineering] Follow [dbt-release workflow](https://www.notion.so/dbtlabs/Releasing-b97c5ea9a02949e79e81db3566bbc8ef#03ff37da697d4d8ba63d24fae1bfa817) 
-- [ ] [Product] Update migration guide (next.docs.getdbt.com)
-
-### Release Cloud
-- [ ] [Engineering] Create a platform issue to update dbt Cloud and verify it is completed. [Example issue](https://github.com/dbt-labs/dbt-cloud/issues/3481)
-- [ ] [Engineering] Determine if schemas have changed. If so, generate new schemas and push to schemas.getdbt.com
-
-### Announce
-- [ ] [Product] Publish discourse
-- [ ] [Product] Announce in dbt Slack
-
-### Post-release
-- [ ] [Engineering] [Bump plugin versions](https://www.notion.so/dbtlabs/Releasing-b97c5ea9a02949e79e81db3566bbc8ef#f01854e8da3641179fbcbe505bdf515c) (dbt-spark + dbt-presto), add compatibility as needed
-   - [ ]  [Spark](https://github.com/dbt-labs/dbt-spark) 
-   - [ ]  [Presto](https://github.com/dbt-labs/dbt-presto)
-- [ ] [Engineering] Create a platform issue to update dbt-spark versions to dbt Cloud. [Example issue](https://github.com/dbt-labs/dbt-cloud/issues/3481)
-- [ ] [Product] Release new version of dbt-utils with new dbt version compatibility. If there are breaking changes requiring a minor version, plan upgrades of other packages that depend on dbt-utils.
-- [ ] [Engineering] Create an epic for the final release

.github/dependabot.yml

@@ -11,26 +11,11 @@ updates:
     schedule:
       interval: "daily"
     rebase-strategy: "disabled"
-  - package-ecosystem: "pip"
-    directory: "/plugins/bigquery"
-    schedule:
-      interval: "daily"
-    rebase-strategy: "disabled"
   - package-ecosystem: "pip"
     directory: "/plugins/postgres"
     schedule:
       interval: "daily"
     rebase-strategy: "disabled"
-  - package-ecosystem: "pip"
-    directory: "/plugins/redshift"
-    schedule:
-      interval: "daily"
-    rebase-strategy: "disabled"
-  - package-ecosystem: "pip"
-    directory: "/plugins/snowflake"
-    schedule:
-      interval: "daily"
-    rebase-strategy: "disabled"
 
   # docker dependencies
   - package-ecosystem: "docker"

.github/pull_request_template.md

@@ -4,18 +4,18 @@ resolves #
   Include the number of the issue addressed by this PR above if applicable.
   PRs for code changes without an associated issue *will not be merged*.
   See CONTRIBUTING.md for more information.
-
-  Example:
-    resolves #1234
 -->
 
 ### Description
 
-<!--- Describe the Pull Request here -->
+<!---
+  Describe the Pull Request here. Add any references and info to help reviewers
+  understand your changes. Include any tradeoffs you considered.
+-->
 
 ### Checklist
 
 - [ ] I have signed the [CLA](https://docs.getdbt.com/docs/contributor-license-agreements)
 - [ ] I have run this code in development and it appears to resolve the stated issue
 - [ ] This PR includes tests, or tests are not required/relevant for this PR
-- [ ] I have updated the `CHANGELOG.md` and added information about my change to the "dbt next" section.
+- [ ] I have updated the `CHANGELOG.md` and added information about my change

.github/scripts/integration-test-matrix.js

@@ -1,7 +1,7 @@
 module.exports = ({ context }) => {
   const defaultPythonVersion = "3.8";
-  const supportedPythonVersions = ["3.6", "3.7", "3.8", "3.9"];
-  const supportedAdapters = ["snowflake", "postgres", "bigquery", "redshift"];
+  const supportedPythonVersions = ["3.7", "3.8", "3.9"];
+  const supportedAdapters = ["postgres"];
 
   // if PR, generate matrix based on files changed and PR labels
   if (context.eventName.includes("pull_request")) {

.github/workflows/integration.yml

@@ -91,16 +91,6 @@ jobs:
               - 'core/**'
               - 'plugins/postgres/**'
               - 'dev-requirements.txt'
-            snowflake:
-              - 'core/**'
-              - 'plugins/snowflake/**'
-            bigquery:
-              - 'core/**'
-              - 'plugins/bigquery/**'
-            redshift:
-              - 'core/**'
-              - 'plugins/redshift/**'
-              - 'plugins/postgres/**'
 
       - name: Generate integration test matrix
         id: generate-matrix
@@ -182,7 +172,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install --upgrade pip
+          pip install --user --upgrade pip
           pip install tox
           pip --version
           tox --version
@@ -191,40 +181,6 @@ jobs:
         if: matrix.adapter == 'postgres'
         run: tox
 
-      - name: Run tox (redshift)
-        if: matrix.adapter == 'redshift'
-        env:
-          REDSHIFT_TEST_DBNAME: ${{ secrets.REDSHIFT_TEST_DBNAME }}
-          REDSHIFT_TEST_PASS: ${{ secrets.REDSHIFT_TEST_PASS }}
-          REDSHIFT_TEST_USER: ${{ secrets.REDSHIFT_TEST_USER }}
-          REDSHIFT_TEST_PORT: ${{ secrets.REDSHIFT_TEST_PORT }}
-          REDSHIFT_TEST_HOST: ${{ secrets.REDSHIFT_TEST_HOST }}
-        run: tox
-
-      - name: Run tox (snowflake)
-        if: matrix.adapter == 'snowflake'
-        env:
-          SNOWFLAKE_TEST_ACCOUNT: ${{ secrets.SNOWFLAKE_TEST_ACCOUNT }}
-          SNOWFLAKE_TEST_PASSWORD: ${{ secrets.SNOWFLAKE_TEST_PASSWORD }}
-          SNOWFLAKE_TEST_USER: ${{ secrets.SNOWFLAKE_TEST_USER }}
-          SNOWFLAKE_TEST_WAREHOUSE: ${{ secrets.SNOWFLAKE_TEST_WAREHOUSE }}
-          SNOWFLAKE_TEST_OAUTH_REFRESH_TOKEN: ${{ secrets.SNOWFLAKE_TEST_OAUTH_REFRESH_TOKEN }}
-          SNOWFLAKE_TEST_OAUTH_CLIENT_ID: ${{ secrets.SNOWFLAKE_TEST_OAUTH_CLIENT_ID }}
-          SNOWFLAKE_TEST_OAUTH_CLIENT_SECRET: ${{ secrets.SNOWFLAKE_TEST_OAUTH_CLIENT_SECRET }}
-          SNOWFLAKE_TEST_ALT_DATABASE: ${{ secrets.SNOWFLAKE_TEST_ALT_DATABASE }}
-          SNOWFLAKE_TEST_ALT_WAREHOUSE: ${{ secrets.SNOWFLAKE_TEST_ALT_WAREHOUSE }}
-          SNOWFLAKE_TEST_DATABASE: ${{ secrets.SNOWFLAKE_TEST_DATABASE }}
-          SNOWFLAKE_TEST_QUOTED_DATABASE: ${{ secrets.SNOWFLAKE_TEST_QUOTED_DATABASE }}
-          SNOWFLAKE_TEST_ROLE: ${{ secrets.SNOWFLAKE_TEST_ROLE }}
-        run: tox
-
-      - name: Run tox (bigquery)
-        if: matrix.adapter == 'bigquery'
-        env:
-          BIGQUERY_TEST_SERVICE_ACCOUNT_JSON: ${{ secrets.BIGQUERY_TEST_SERVICE_ACCOUNT_JSON }}
-          BIGQUERY_TEST_ALT_DATABASE: ${{ secrets.BIGQUERY_TEST_ALT_DATABASE }}
-        run: tox
-
       - uses: actions/upload-artifact@v2
         if: always()
         with:

.github/workflows/main.yml

@@ -61,7 +61,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install --upgrade pip
+          pip install --user --upgrade pip
           pip install tox
           pip --version
           tox --version
@@ -77,7 +77,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8] # TODO: support unit testing for python 3.9 (https://github.com/dbt-labs/dbt/issues/3689)
+        python-version: [3.7, 3.8] # TODO: support unit testing for python 3.9 (https://github.com/dbt-labs/dbt/issues/3689)
 
     env:
       TOXENV: "unit"
@@ -96,7 +96,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install --upgrade pip
+          pip install --user --upgrade pip
           pip install tox
           pip --version
           tox --version
@@ -133,7 +133,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install --upgrade pip
+          pip install --user --upgrade pip
           pip install --upgrade setuptools wheel twine check-wheel-contents
           pip --version
 
@@ -167,7 +167,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}
@@ -177,7 +177,7 @@ jobs:
 
       - name: Install python dependencies
         run: |
-          pip install --upgrade pip
+          pip install --user --upgrade pip
           pip install --upgrade wheel
           pip --version
 
@@ -198,8 +198,9 @@ jobs:
           dbt --version
 
       - name: Install source distributions
+        # ignore dbt-1.0.0, which intentionally raises an error when installed from source
         run: |
-          find ./dist/*.gz -maxdepth 1 -type f | xargs pip install --force-reinstall --find-links=dist/
+          find ./dist/dbt-[a-z]*.gz -maxdepth 1 -type f | xargs pip install --force-reinstall --find-links=dist/
 
       - name: Check source distributions
         run: |

.github/workflows/performance.yml

@@ -164,11 +164,13 @@ jobs:
           name: runner
       - name: change permissions
         run: chmod +x ./runner
+      - name: make results directory
+        run: mkdir ./final-output/
       - name: run calculation
-        run: ./runner calculate -r ./
+        run: ./runner calculate -r ./ -o ./final-output/
         # always attempt to upload the results even if there were regressions found
       - uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:
           name: final-calculations
-          path: ./final_calculations.json
+          path: ./final-output/*

.github/workflows/schema-check.yml

@@ -0,0 +1,87 @@
+# **what?**
+# Compares the schema of the dbt version of the given ref vs 
+# the latest official schema releases found in schemas.getdbt.com.
+# If there are differences, the workflow will fail and upload the
+# diff as an artifact. The metadata team should be alerted to the change.
+#
+# **why?**
+# Reaction work may need to be done if artifact schema changes
+# occur so we want to proactively alert to it.
+#
+# **when?**
+# On pushes to `develop` and release branches. Manual runs are also enabled.
+name: Artifact Schema Check
+
+on:
+  workflow_dispatch:
+  pull_request: #TODO: remove before merging
+  push:
+    branches:
+      - "develop"
+      - "*.latest"
+      - "releases/*"
+
+env:
+  LATEST_SCHEMA_PATH: ${{ github.workspace }}/new_schemas
+  SCHEMA_DIFF_ARTIFACT: ${{ github.workspace }}//schema_schanges.txt
+  DBT_REPO_DIRECTORY: ${{ github.workspace }}/dbt
+  SCHEMA_REPO_DIRECTORY: ${{ github.workspace }}/schemas.getdbt.com
+
+jobs:
+  checking-schemas:
+    name: "Checking schemas"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+                
+      - name: Checkout dbt repo
+        uses: actions/checkout@v2.3.4
+        with:
+            path: ${{ env.DBT_REPO_DIRECTORY }}
+                       
+      - name: Checkout schemas.getdbt.com repo
+        uses: actions/checkout@v2.3.4    
+        with: 
+          repository: dbt-labs/schemas.getdbt.com
+          ref: 'main'
+          ssh-key: ${{ secrets.SCHEMA_SSH_PRIVATE_KEY }}
+          path: ${{ env.SCHEMA_REPO_DIRECTORY }}
+        
+      - name: Generate current schema
+        run: |
+          cd ${{ env.DBT_REPO_DIRECTORY }}
+          python3 -m venv env
+          source env/bin/activate
+          pip install --upgrade pip
+          pip install -r dev-requirements.txt -r editable-requirements.txt
+          python scripts/collect-artifact-schema.py --path ${{ env.LATEST_SCHEMA_PATH }}
+          
+      # Copy generated schema files into the schemas.getdbt.com repo
+      # Do a git diff to find any changes
+      # Ignore any date or version changes though
+      - name: Compare schemas
+        run: |
+          cp -r ${{ env.LATEST_SCHEMA_PATH }}/dbt ${{ env.SCHEMA_REPO_DIRECTORY }}
+          cd ${{ env.SCHEMA_REPO_DIRECTORY }}
+          diff_results=$(git diff -I='*[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T' \
+          -I='*[0-9]{1}.[0-9]{2}.[0-9]{1}(rc[0-9]|b[0-9]| )' --compact-summary)
+          if [[ $(echo diff_results) ]]; then
+            echo $diff_results
+            echo "Schema changes detected!"
+            git diff -I='*[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T' \
+              -I='*[0-9]{1}.[0-9]{2}.[0-9]{1}(rc[0-9]|b[0-9]| )' > ${{ env.SCHEMA_DIFF_ARTIFACT }}
+            exit 1
+          else
+            echo "No schema changes detected"
+          fi
+
+      - name: Upload schema diff
+        uses: actions/upload-artifact@v2.2.4
+        if: ${{ failure() }}
+        with:
+          name: 'schema_schanges.txt'
+          path: '${{ env.SCHEMA_DIFF_ARTIFACT }}'

.github/workflows/stale.yml

@@ -0,0 +1,18 @@
+name: "Close stale issues and PRs"
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      # pinned at v4 (https://github.com/actions/stale/releases/tag/v4.0.0)
+      - uses: actions/stale@cdf15f641adb27a71842045a94023bef6945e3aa
+        with:
+          stale-issue-message: "This issue has been marked as Stale because it has been open for 180 days with no activity. If you would like the issue to remain open, please remove the stale label or comment on the issue, or it will be closed in 7 days."
+          stale-pr-message: "This PR has been marked as Stale because it has been open for 180 days with no activity. If you would like the PR to remain open, please remove the stale label or comment on the PR, or it will be closed in 7 days."
+          # mark issues/PRs stale when they haven't seen activity in 180 days
+          days-before-stale: 180
+          # ignore checking issues with the following labels
+          exempt-issue-labels: "epic,discussion"

.github/workflows/version-bump.yml

@@ -0,0 +1,109 @@
+# **what?**
+# This workflow will take a version number and a dry run flag. With that
+# it will run versionbump to update the version number everywhere in the 
+# code base and then generate an update Docker requirements file. If this
+# is a dry run, a draft PR will open with the changes. If this isn't a dry
+# run, the changes will be committed to the branch this is run on.
+
+# **why?**
+# This is to aid in releasing dbt and making sure we have updated 
+# the versions and Docker requirements in all places.
+
+# **when?**
+# This is triggered either manually OR 
+# from the repository_dispatch event "version-bump" which is sent from
+# the dbt-release repo Action
+
+name: Version Bump
+
+on:
+  workflow_dispatch:
+    inputs:
+      version_number:
+       description: 'The version number to bump to'
+       required: true
+      is_dry_run:
+       description: 'Creates a draft PR to allow testing instead of committing to a branch'
+       required: true
+       default: 'true'  
+  repository_dispatch:
+    types: [version-bump]
+  
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repository
+        uses: actions/checkout@v2
+
+      - name: Set version and dry run values
+        id: variables
+        env:
+          VERSION_NUMBER: "${{ github.event.client_payload.version_number == '' && github.event.inputs.version_number || github.event.client_payload.version_number }}"
+          IS_DRY_RUN: "${{ github.event.client_payload.is_dry_run == '' && github.event.inputs.is_dry_run || github.event.client_payload.is_dry_run }}"
+        run: |
+          echo Repository dispatch event version: ${{ github.event.client_payload.version_number }}
+          echo Repository dispatch event dry run: ${{ github.event.client_payload.is_dry_run }}
+          echo Workflow dispatch event version: ${{ github.event.inputs.version_number }}
+          echo Workflow dispatch event dry run: ${{ github.event.inputs.is_dry_run }}
+          echo ::set-output name=VERSION_NUMBER::$VERSION_NUMBER
+          echo ::set-output name=IS_DRY_RUN::$IS_DRY_RUN
+
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.8"
+
+      - name: Install python dependencies
+        run: |
+          python3 -m venv env
+          source env/bin/activate
+          pip install --upgrade pip     
+          
+      - name: Create PR branch
+        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'true' }}
+        run: |
+          git checkout -b bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID
+          git push origin bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID
+          git branch --set-upstream-to=origin/bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_$GITHUB_RUN_ID
+      
+      - name: Generate Docker requirements
+        run: |
+          source env/bin/activate
+          pip install -r requirements.txt 
+          pip freeze -l > docker/requirements/requirements.txt
+          git status
+
+      - name: Bump version
+        run: |
+          source env/bin/activate
+          pip install -r dev-requirements.txt 
+          env/bin/bumpversion --allow-dirty --new-version ${{steps.variables.outputs.VERSION_NUMBER}} major
+          git status
+
+      - name: Commit version bump directly
+        uses: EndBug/add-and-commit@v7
+        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'false' }}
+        with:
+          author_name: 'Github Build Bot'
+          author_email: 'buildbot@fishtownanalytics.com'
+          message: 'Bumping version to ${{steps.variables.outputs.VERSION_NUMBER}}'
+
+      - name: Commit version bump to branch
+        uses: EndBug/add-and-commit@v7
+        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'true' }}
+        with:
+          author_name: 'Github Build Bot'
+          author_email: 'buildbot@fishtownanalytics.com'
+          message: 'Bumping version to ${{steps.variables.outputs.VERSION_NUMBER}}'
+          branch: 'bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_${{GITHUB.RUN_ID}}'
+          push: 'origin origin/bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_${{GITHUB.RUN_ID}}'
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        if: ${{ steps.variables.outputs.IS_DRY_RUN == 'true' }}
+        with:
+          author: 'Github Build Bot <buildbot@fishtownanalytics.com>'
+          draft: true
+          base: ${{github.ref}}
+          title: 'Bumping version to ${{steps.variables.outputs.VERSION_NUMBER}}'
+          branch: 'bumping-version/${{steps.variables.outputs.VERSION_NUMBER}}_${{GITHUB.RUN_ID}}'

ARCHITECTURE.md

@@ -1,8 +1,9 @@
-The core function of dbt is SQL compilation and execution. Users create projects of dbt resources (models, tests, seeds, snapshots, ...), defined in SQL and YAML files, and they invoke dbt to create, update, or query associated views and tables. Today, dbt makes heavy use of Jinja2 to enable the templating of SQL, and to construct a DAG (Directed Acyclic Graph) from all of the resources in a project. Users can also extend their projects by installing resources (including Jinja macros) from other projects, called "packages." 
+The core function of dbt is SQL compilation and execution. Users create projects of dbt resources (models, tests, seeds, snapshots, ...), defined in SQL and YAML files, and they invoke dbt to create, update, or query associated views and tables. Today, dbt makes heavy use of Jinja2 to enable the templating of SQL, and to construct a DAG (Directed Acyclic Graph) from all of the resources in a project. Users can also extend their projects by installing resources (including Jinja macros) from other projects, called "packages."
 
 ## dbt-core
 
 Most of the python code in the repository is within the `core/dbt` directory. Currently the main subdirectories are:
+
 - [`adapters`](core/dbt/adapters): Define base classes for behavior that is likely to differ across databases
 - [`clients`](core/dbt/clients): Interface with dependencies (agate, jinja) or across operating systems
 - [`config`](core/dbt/config): Reconcile user-supplied configuration from connection profiles, project files, and Jinja macros
@@ -12,23 +13,20 @@ Most of the python code in the repository is within the `core/dbt` directory. Cu
 - [`graph`](core/dbt/graph): Produce a `networkx` DAG of project resources, and selecting those resources given user-supplied criteria
 - [`include`](core/dbt/include): The dbt "global project," which defines default implementations of Jinja2 macros
 - [`parser`](core/dbt/parser): Read project files, validate, construct python objects
-- [`rpc`](core/dbt/rpc): Provide remote procedure call server for invoking dbt, following JSON-RPC 2.0 spec
 - [`task`](core/dbt/task): Set forth the actions that dbt can perform when invoked
 
 ### Invoking dbt
 
-There are two supported ways of invoking dbt: from the command line and using an RPC server.
-
-The "tasks" map to top-level dbt commands. So `dbt run` => task.run.RunTask, etc. Some are more like abstract base classes (GraphRunnableTask, for example) but all the concrete types outside of task/rpc should map to tasks. Currently one executes at a time. The tasks kick off their “Runners” and those do execute in parallel. The parallelism is managed via a thread pool, in GraphRunnableTask.
+The "tasks" map to top-level dbt commands. So `dbt run` => task.run.RunTask, etc. Some are more like abstract base classes (GraphRunnableTask, for example) but all the concrete types outside of task should map to tasks. Currently one executes at a time. The tasks kick off their “Runners” and those do execute in parallel. The parallelism is managed via a thread pool, in GraphRunnableTask.
 
 core/dbt/include/index.html
 This is the docs website code. It comes from the dbt-docs repository, and is generated when a release is packaged.
 
 ## Adapters
 
-dbt uses an adapter-plugin pattern to extend support to different databases, warehouses, query engines, etc. The four core adapters that are in the main repository, contained within the [`plugins`](plugins) subdirectory, are: Postgres Redshift, Snowflake and BigQuery. Other warehouses use adapter plugins defined in separate repositories (e.g. [dbt-spark](https://github.com/dbt-labs/dbt-spark), [dbt-presto](https://github.com/dbt-labs/dbt-presto)).
+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.
 
-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. 
+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.
 
 Each adapter plugin is a standalone python package that includes:
 

CONTRIBUTING.md

@@ -14,6 +14,10 @@ This document is a guide intended for folks interested in contributing to `dbt`.
 
 If you're new to python development or contributing to open-source software, we encourage you to read this document from start to finish. If you get stuck, drop us a line in the `#dbt-core-development` channel on [slack](https://community.getdbt.com).
 
+#### Adapters
+
+If you have an issue or code change suggestion related to a specific database [adapter](https://docs.getdbt.com/docs/available-adapters); please refer to that supported databases seperate repo for those contributions.
+
 ### Signing the CLA
 
 Please note that all contributors to `dbt` must sign the [Contributor License Agreement](https://docs.getdbt.com/docs/contributor-license-agreements) to have their Pull Request merged into the `dbt` codebase. If you are unable to sign the CLA, then the `dbt` maintainers will unfortunately be unable to merge your Pull Request. You are, however, welcome to open issues and comment on existing ones.
@@ -24,7 +28,7 @@ Please note that all contributors to `dbt` must sign the [Contributor License Ag
 
 ### Defining the problem
 
-If you have an idea for a new feature or if you've discovered a bug in `dbt`, the first step is to open an issue. Please check the list of [open issues](https://github.com/dbt-labs/dbt/issues) before creating a new one. If you find a relevant issue, please add a comment to the open issue instead of creating a new one. There are hundreds of open issues in this repository and it can be hard to know where to look for a relevant open issue. **The `dbt` maintainers are always happy to point contributors in the right direction**, so please err on the side of documenting your idea in a new issue if you are unsure where a problem statement belongs.
+If you have an idea for a new feature or if you've discovered a bug in `dbt`, the first step is to open an issue. Please check the list of [open issues](https://github.com/dbt-labs/dbt-core/issues) before creating a new one. If you find a relevant issue, please add a comment to the open issue instead of creating a new one. There are hundreds of open issues in this repository and it can be hard to know where to look for a relevant open issue. **The `dbt` maintainers are always happy to point contributors in the right direction**, so please err on the side of documenting your idea in a new issue if you are unsure where a problem statement belongs.
 
 > **Note:** All community-contributed Pull Requests _must_ be associated with an open issue. If you submit a Pull Request that does not pertain to an open issue, you will be asked to create an issue describing the problem before the Pull Request can be reviewed.
 
@@ -36,7 +40,7 @@ After you open an issue, a `dbt` maintainer will follow up by commenting on your
 
 If an issue is appropriately well scoped and describes a beneficial change to the `dbt` codebase, then anyone may submit a Pull Request to implement the functionality described in the issue. See the sections below on how to do this.
 
-The `dbt` maintainers will add a `good first issue` label if an issue is suitable for a first-time contributor. This label often means that the required code change is small, limited to one database adapter, or a net-new addition that does not impact existing functionality. You can see the list of currently open issues on the [Contribute](https://github.com/dbt-labs/dbt/contribute) page.
+The `dbt` maintainers will add a `good first issue` label if an issue is suitable for a first-time contributor. This label often means that the required code change is small, limited to one database adapter, or a net-new addition that does not impact existing functionality. You can see the list of currently open issues on the [Contribute](https://github.com/dbt-labs/dbt-core/contribute) page.
 
 Here's a good workflow:
 - Comment on the open issue, expressing your interest in contributing the required code change
@@ -52,15 +56,15 @@ The `dbt` maintainers use labels to categorize open issues. Some labels indicate
 
 | tag | description |
 | --- | ----------- |
-| [triage](https://github.com/dbt-labs/dbt/labels/triage) | This is a new issue which has not yet been reviewed by a `dbt` maintainer. This label is removed when a maintainer reviews and responds to the issue. |
-| [bug](https://github.com/dbt-labs/dbt/labels/bug) | This issue represents a defect or regression in `dbt` |
-| [enhancement](https://github.com/dbt-labs/dbt/labels/enhancement) | This issue represents net-new functionality in `dbt` |
-| [good first issue](https://github.com/dbt-labs/dbt/labels/good%20first%20issue) | This issue does not require deep knowledge of the `dbt` codebase to implement. This issue is appropriate for a first-time contributor. |
-| [help wanted](https://github.com/dbt-labs/dbt/labels/help%20wanted) / [discussion](https://github.com/dbt-labs/dbt/labels/discussion) | Conversation around this issue in ongoing, and there isn't yet a clear path forward. Input from community members is most welcome. |
-| [duplicate](https://github.com/dbt-labs/dbt/issues/duplicate) | This issue is functionally identical to another open issue. The `dbt` maintainers will close this issue and encourage community members to focus conversation on the other one. |
-| [snoozed](https://github.com/dbt-labs/dbt/labels/snoozed) | This issue describes a good idea, but one which will probably not be addressed in a six-month time horizon. The `dbt` maintainers will revist these issues periodically and re-prioritize them accordingly. |
-| [stale](https://github.com/dbt-labs/dbt/labels/stale) | This is an old issue which has not recently been updated. Stale issues will periodically be closed by `dbt` maintainers, but they can be re-opened if the discussion is restarted. |
-| [wontfix](https://github.com/dbt-labs/dbt/labels/wontfix) | This issue does not require a code change in the `dbt` repository, or the maintainers are unwilling/unable to merge a Pull Request which implements the behavior described in the issue. |
+| [triage](https://github.com/dbt-labs/dbt-core/labels/triage) | This is a new issue which has not yet been reviewed by a `dbt` maintainer. This label is removed when a maintainer reviews and responds to the issue. |
+| [bug](https://github.com/dbt-labs/dbt-core/labels/bug) | This issue represents a defect or regression in `dbt` |
+| [enhancement](https://github.com/dbt-labs/dbt-core/labels/enhancement) | This issue represents net-new functionality in `dbt` |
+| [good first issue](https://github.com/dbt-labs/dbt-core/labels/good%20first%20issue) | This issue does not require deep knowledge of the `dbt` codebase to implement. This issue is appropriate for a first-time contributor. |
+| [help wanted](https://github.com/dbt-labs/dbt-core/labels/help%20wanted) / [discussion](https://github.com/dbt-labs/dbt-core/labels/discussion) | Conversation around this issue in ongoing, and there isn't yet a clear path forward. Input from community members is most welcome. |
+| [duplicate](https://github.com/dbt-labs/dbt-core/issues/duplicate) | This issue is functionally identical to another open issue. The `dbt` maintainers will close this issue and encourage community members to focus conversation on the other one. |
+| [snoozed](https://github.com/dbt-labs/dbt-core/labels/snoozed) | This issue describes a good idea, but one which will probably not be addressed in a six-month time horizon. The `dbt` maintainers will revist these issues periodically and re-prioritize them accordingly. |
+| [stale](https://github.com/dbt-labs/dbt-core/labels/stale) | This is an old issue which has not recently been updated. Stale issues will periodically be closed by `dbt` maintainers, but they can be re-opened if the discussion is restarted. |
+| [wontfix](https://github.com/dbt-labs/dbt-core/labels/wontfix) | This issue does not require a code change in the `dbt` repository, or the maintainers are unwilling/unable to merge a Pull Request which implements the behavior described in the issue. |
 
 #### Branching Strategy
 
@@ -103,7 +107,7 @@ A short list of tools used in `dbt` testing that will be helpful to your underst
 - [`make`](https://users.cs.duke.edu/~ola/courses/programming/Makefiles/Makefiles.html) - but don't worry too much, nobody _really_ understands how make works and our Makefile is super simple
 - [`flake8`](https://flake8.pycqa.org/en/latest/) for code linting
 - [`mypy`](https://mypy.readthedocs.io/en/stable/) for static type checking
-- [CircleCI](https://circleci.com/product/) and [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/)
+- [Github Actions](https://github.com/features/actions)
 
 A deep understanding of these tools in not required to effectively contribute to `dbt`, but we recommend checking out the attached documentation if you're interested in learning more about them.
 
@@ -155,7 +159,7 @@ Configure your [profile](https://docs.getdbt.com/docs/configure-your-profile) as
 
 Getting the `dbt` integration tests set up in your local environment will be very helpful as you start to make changes to your local version of `dbt`. The section that follows outlines some helpful tips for setting up the test environment.
 
-Since `dbt` works with a number of different databases, you will need to supply credentials for one or more of these databases in your test environment. Most organizations don't have access to each of a BigQuery, Redshift, Snowflake, and Postgres database, so it's likely that you will be unable to run every integration test locally. Fortunately, dbt Labs provides a CI environment with access to sandboxed Redshift, Snowflake, BigQuery, and Postgres databases. See the section on [_Submitting a Pull Request_](#submitting-a-pull-request) below for more information on this CI setup.
+Although `dbt` works with a number of different databases, you won't need to supply credentials for every one of these databases in your test environment. Instead you can test all dbt-core code changes with Python and Postgres.
 
 ### Initial setup
 
@@ -170,8 +174,6 @@ docker-compose up -d database
 PGHOST=localhost PGUSER=root PGPASSWORD=password PGDATABASE=postgres bash test/setup_db.sh
 ```
 
-Note that you may need to run the previous command twice as it does not currently wait for the database to be running before attempting to run commands against it.  This will be fixed with [#3876](https://github.com/dbt-labs/dbt/issues/3876).
-
 `dbt` uses test credentials specified in a `test.env` file in the root of the repository for non-Postgres databases. This `test.env` file is git-ignored, but please be _extra_ careful to never check in credentials or other sensitive information when developing against `dbt`. To create your `test.env` file, copy the provided sample file, then supply your relevant credentials. This step is only required to use non-Postgres databases.
 
 ```
@@ -226,7 +228,7 @@ python -m pytest test/unit/test_graph.py::GraphTest::test__dependency_list
 > is a list of useful command-line options for `pytest` to use while developing.
 ## Submitting a Pull Request
 
-dbt Labs provides a sandboxed Redshift, Snowflake, and BigQuery database for use in a CI environment. When pull requests are submitted to the `dbt-labs/dbt` repo, GitHub will trigger automated tests in CircleCI and Azure Pipelines.
+dbt Labs provides a CI environment to test changes to specific adapters, and periodic maintenance checks of `dbt-core` through Github Actions. For example, if you submit a pull request to the `dbt-redshift` repo, GitHub will trigger automated code checks and tests against Redshift.
 
 A `dbt` maintainer will review your PR. They may suggest code revision for style or clarity, or request that you add unit or integration test(s). These are good things! We believe that, with a little bit of help, anyone can contribute high-quality code.
 

Dockerfile.test

@@ -27,7 +27,7 @@ RUN apt-get update \
     && apt-get install -y \
     python \
     python-dev \
-    python-pip \
+    python3-pip \
     python3.6 \
     python3.6-dev \
     python3-pip \

Makefile

@@ -44,30 +44,6 @@ integration-postgres: .env ## Runs postgres integration tests with py38.
 integration-postgres-fail-fast: .env ## Runs postgres integration tests with py38 in "fail fast" mode.
 	$(DOCKER_CMD) tox -e py38-postgres -- -x -nauto
 
-.PHONY: integration-redshift
-integration-redshift: .env ## Runs redshift integration tests with py38.
-	$(DOCKER_CMD) tox -e py38-redshift -- -nauto
-
-.PHONY: integration-redshift-fail-fast
-integration-redshift-fail-fast: .env ## Runs redshift integration tests with py38 in "fail fast" mode.
-	$(DOCKER_CMD) tox -e py38-redshift -- -x -nauto
-
-.PHONY: integration-snowflake
-integration-snowflake: .env ## Runs snowflake integration tests with py38.
-	$(DOCKER_CMD) tox -e py38-snowflake -- -nauto
-
-.PHONY: integration-snowflake-fail-fast
-integration-snowflake-fail-fast: .env ## Runs snowflake integration tests with py38 in "fail fast" mode.
-	$(DOCKER_CMD) tox -e py38-snowflake -- -x -nauto
-
-.PHONY: integration-bigquery
-integration-bigquery: .env ## Runs bigquery integration tests with py38.
-	$(DOCKER_CMD) tox -e py38-bigquery -- -nauto
-
-.PHONY: integration-bigquery-fail-fast
-integration-bigquery-fail-fast: .env ## Runs bigquery integration tests with py38 in "fail fast" mode.
-	$(DOCKER_CMD) tox -e py38-bigquery -- -x -nauto
-
 .PHONY: setup-db
 setup-db: ## Setup Postgres database with docker-compose for system testing.
 	docker-compose up -d database

README.md

@@ -1,18 +1,18 @@
 <p align="center">
-  <img src="https://raw.githubusercontent.com/dbt-labs/dbt/ec7dee39f793aa4f7dd3dae37282cc87664813e4/etc/dbt-logo-full.svg" alt="dbt logo" width="500"/>
+  <img src="https://raw.githubusercontent.com/dbt-labs/dbt-core/fa1ea14ddfb1d5ae319d5141844910dd53ab2834/etc/dbt-core.svg" alt="dbt logo" width="750"/>
 </p>
 <p align="center">
-  <a href="https://github.com/dbt-labs/dbt/actions/workflows/main.yml">
-    <img src="https://github.com/dbt-labs/dbt/actions/workflows/main.yml/badge.svg?event=push" alt="Unit Tests Badge"/>
+  <a href="https://github.com/dbt-labs/dbt-core/actions/workflows/main.yml">
+    <img src="https://github.com/dbt-labs/dbt-core/actions/workflows/main.yml/badge.svg?event=push" alt="Unit Tests Badge"/>
   </a>
-  <a href="https://github.com/dbt-labs/dbt/actions/workflows/integration.yml">
-    <img src="https://github.com/dbt-labs/dbt/actions/workflows/integration.yml/badge.svg?event=push" alt="Integration Tests Badge"/>
+  <a href="https://github.com/dbt-labs/dbt-core/actions/workflows/integration.yml">
+    <img src="https://github.com/dbt-labs/dbt-core/actions/workflows/integration.yml/badge.svg?event=push" alt="Integration Tests Badge"/>
   </a>
 </p>
 
 **[dbt](https://www.getdbt.com/)** enables data analysts and engineers to transform their data using the same practices that software engineers use to build applications.
 
-![architecture](https://raw.githubusercontent.com/dbt-labs/dbt/6c6649f9129d5d108aa3b0526f634cd8f3a9d1ed/etc/dbt-arch.png)
+![architecture](https://raw.githubusercontent.com/dbt-labs/dbt-core/6c6649f9129d5d108aa3b0526f634cd8f3a9d1ed/etc/dbt-arch.png)
 
 ## Understanding dbt
 
@@ -20,7 +20,7 @@ Analysts using dbt can transform their data by simply writing select statements,
 
 These select statements, or "models", form a dbt project. Models frequently build on top of one another – dbt makes it easy to [manage relationships](https://docs.getdbt.com/docs/ref) between models, and [visualize these relationships](https://docs.getdbt.com/docs/documentation), as well as assure the quality of your transformations through [testing](https://docs.getdbt.com/docs/testing).
 
-![dbt dag](https://raw.githubusercontent.com/dbt-labs/dbt/6c6649f9129d5d108aa3b0526f634cd8f3a9d1ed/etc/dbt-dag.png)
+![dbt dag](https://raw.githubusercontent.com/dbt-labs/dbt-core/6c6649f9129d5d108aa3b0526f634cd8f3a9d1ed/etc/dbt-dag.png)
 
 ## Getting started
 
@@ -34,8 +34,8 @@ These select statements, or "models", form a dbt project. Models frequently buil
 
 ## Reporting bugs and contributing code
 
-- Want to report a bug or request a feature? Let us know on [Slack](http://community.getdbt.com/), or open [an issue](https://github.com/dbt-labs/dbt/issues/new)
-- Want to help us build dbt? Check out the [Contributing Guide](https://github.com/dbt-labs/dbt/blob/HEAD/CONTRIBUTING.md)
+- Want to report a bug or request a feature? Let us know on [Slack](http://community.getdbt.com/), or open [an issue](https://github.com/dbt-labs/dbt-core/issues/new)
+- Want to help us build dbt? Check out the [Contributing Guide](https://github.com/dbt-labs/dbt-core/blob/HEAD/CONTRIBUTING.md)
 
 ## Code of Conduct
 

core/README.md

@@ -0,0 +1,42 @@
+<p align="center">
+  <img src="https://raw.githubusercontent.com/dbt-labs/dbt-core/fa1ea14ddfb1d5ae319d5141844910dd53ab2834/etc/dbt-core.svg" alt="dbt logo" width="750"/>
+</p>
+<p align="center">
+  <a href="https://github.com/dbt-labs/dbt-core/actions/workflows/main.yml">
+    <img src="https://github.com/dbt-labs/dbt-core/actions/workflows/main.yml/badge.svg?event=push" alt="Unit Tests Badge"/>
+  </a>
+  <a href="https://github.com/dbt-labs/dbt-core/actions/workflows/integration.yml">
+    <img src="https://github.com/dbt-labs/dbt-core/actions/workflows/integration.yml/badge.svg?event=push" alt="Integration Tests Badge"/>
+  </a>
+</p>
+
+**[dbt](https://www.getdbt.com/)** enables data analysts and engineers to transform their data using the same practices that software engineers use to build applications.
+
+![architecture](https://raw.githubusercontent.com/dbt-labs/dbt-core/6c6649f9129d5d108aa3b0526f634cd8f3a9d1ed/etc/dbt-arch.png)
+
+## Understanding dbt
+
+Analysts using dbt can transform their data by simply writing select statements, while dbt handles turning these statements into tables and views in a data warehouse.
+
+These select statements, or "models", form a dbt project. Models frequently build on top of one another – dbt makes it easy to [manage relationships](https://docs.getdbt.com/docs/ref) between models, and [visualize these relationships](https://docs.getdbt.com/docs/documentation), as well as assure the quality of your transformations through [testing](https://docs.getdbt.com/docs/testing).
+
+![dbt dag](https://raw.githubusercontent.com/dbt-labs/dbt-core/6c6649f9129d5d108aa3b0526f634cd8f3a9d1ed/etc/dbt-dag.png)
+
+## Getting started
+
+- [Install dbt](https://docs.getdbt.com/docs/installation)
+- Read the [introduction](https://docs.getdbt.com/docs/introduction/) and [viewpoint](https://docs.getdbt.com/docs/about/viewpoint/)
+
+## Join the dbt Community
+
+- Be part of the conversation in the [dbt Community Slack](http://community.getdbt.com/)
+- Read more on the [dbt Community Discourse](https://discourse.getdbt.com)
+
+## Reporting bugs and contributing code
+
+- Want to report a bug or request a feature? Let us know on [Slack](http://community.getdbt.com/), or open [an issue](https://github.com/dbt-labs/dbt-core/issues/new)
+- Want to help us build dbt? Check out the [Contributing Guide](https://github.com/dbt-labs/dbt-core/blob/HEAD/CONTRIBUTING.md)
+
+## Code of Conduct
+
+Everyone interacting in the dbt project's codebases, issue trackers, chat rooms, and mailing lists is expected to follow the [dbt Code of Conduct](https://community.getdbt.com/code-of-conduct).

core/dbt/adapters/base/connections.py

@@ -18,7 +18,17 @@ from dbt.contracts.graph.manifest import Manifest
 from dbt.adapters.base.query_headers import (
     MacroQueryStringSetter,
 )
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import (
+    NewConnection,
+    ConnectionReused,
+    ConnectionLeftOpen,
+    ConnectionLeftOpen2,
+    ConnectionClosed,
+    ConnectionClosed2,
+    Rollback,
+    RollbackFailed
+)
 from dbt import flags
 
 
@@ -136,14 +146,10 @@ class BaseConnectionManager(metaclass=abc.ABCMeta):
         if conn.name == conn_name and conn.state == 'open':
             return conn
 
-        logger.debug(
-            'Acquiring new {} connection "{}".'.format(self.TYPE, conn_name))
+        fire_event(NewConnection(conn_name=conn_name, conn_type=self.TYPE))
 
         if conn.state == 'open':
-            logger.debug(
-                'Re-using an available connection from the pool (formerly {}).'
-                .format(conn.name)
-            )
+            fire_event(ConnectionReused(conn_name=conn_name))
         else:
             conn.handle = LazyHandle(self.open)
 
@@ -190,11 +196,9 @@ class BaseConnectionManager(metaclass=abc.ABCMeta):
         with self.lock:
             for connection in self.thread_connections.values():
                 if connection.state not in {'closed', 'init'}:
-                    logger.debug("Connection '{}' was left open."
-                                 .format(connection.name))
+                    fire_event(ConnectionLeftOpen(conn_name=connection.name))
                 else:
-                    logger.debug("Connection '{}' was properly closed."
-                                 .format(connection.name))
+                    fire_event(ConnectionClosed(conn_name=connection.name))
                 self.close(connection)
 
             # garbage collect these connections
@@ -220,55 +224,40 @@ class BaseConnectionManager(metaclass=abc.ABCMeta):
         try:
             connection.handle.rollback()
         except Exception:
-            logger.debug(
-                'Failed to rollback {}'.format(connection.name),
-                exc_info=True
-            )
+            fire_event(RollbackFailed(conn_name=connection.name))
 
     @classmethod
     def _close_handle(cls, connection: Connection) -> None:
         """Perform the actual close operation."""
         # On windows, sometimes connection handles don't have a close() attr.
         if hasattr(connection.handle, 'close'):
-            logger.debug(f'On {connection.name}: Close')
+            fire_event(ConnectionClosed2(conn_name=connection.name))
             connection.handle.close()
         else:
-            logger.debug(f'On {connection.name}: No close available on handle')
+            fire_event(ConnectionLeftOpen2(conn_name=connection.name))
 
     @classmethod
     def _rollback(cls, connection: Connection) -> None:
         """Roll back the given connection."""
-        if flags.STRICT_MODE:
-            if not isinstance(connection, Connection):
-                raise dbt.exceptions.CompilerException(
-                    f'In _rollback, got {connection} - not a Connection!'
-                )
-
         if connection.transaction_open is False:
             raise dbt.exceptions.InternalException(
                 f'Tried to rollback transaction on connection '
                 f'"{connection.name}", but it does not have one open!'
             )
 
-        logger.debug(f'On {connection.name}: ROLLBACK')
+        fire_event(Rollback(conn_name=connection.name))
         cls._rollback_handle(connection)
 
         connection.transaction_open = False
 
     @classmethod
     def close(cls, connection: Connection) -> Connection:
-        if flags.STRICT_MODE:
-            if not isinstance(connection, Connection):
-                raise dbt.exceptions.CompilerException(
-                    f'In close, got {connection} - not a Connection!'
-                )
-
         # if the connection is in closed or init, there's nothing to do
         if connection.state in {ConnectionState.CLOSED, ConnectionState.INIT}:
             return connection
 
         if connection.transaction_open and connection.handle:
-            logger.debug('On {}: ROLLBACK'.format(connection.name))
+            fire_event(Rollback(conn_name=connection.name))
             cls._rollback_handle(connection)
         connection.transaction_open = False
 

core/dbt/adapters/base/impl.py

@@ -16,9 +16,7 @@ from dbt.exceptions import (
     get_relation_returned_multiple_results,
     InternalException, NotImplementedException, RuntimeException,
 )
-from dbt import flags
 
-from dbt import deprecations
 from dbt.adapters.protocol import (
     AdapterConfig,
     ConnectionManagerProtocol,
@@ -31,7 +29,8 @@ from dbt.contracts.graph.compiled import (
 from dbt.contracts.graph.manifest import Manifest, MacroManifest
 from dbt.contracts.graph.parsed import ParsedSeedNode
 from dbt.exceptions import warn_or_error
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import CacheMiss, ListRelations
 from dbt.utils import filter_null_values, executor
 
 from dbt.adapters.base.connections import Connection, AdapterResponse
@@ -289,12 +288,13 @@ class BaseAdapter(metaclass=AdapterMeta):
     def _schema_is_cached(self, database: Optional[str], schema: str) -> bool:
         """Check if the schema is cached, and by default logs if it is not."""
 
-        if flags.USE_CACHE is False:
-            return False
-        elif (database, schema) not in self.cache:
-            logger.debug(
-                'On "{}": cache miss for schema "{}.{}", this is inefficient'
-                .format(self.nice_connection_name(), database, schema)
+        if (database, schema) not in self.cache:
+            fire_event(
+                CacheMiss(
+                    conn_name=self.nice_connection_name,
+                    database=database,
+                    schema=schema
+                )
             )
             return False
         else:
@@ -324,7 +324,9 @@ class BaseAdapter(metaclass=AdapterMeta):
         """
         info_schema_name_map = SchemaSearchMap()
         nodes: Iterator[CompileResultNode] = chain(
-            manifest.nodes.values(),
+            [node for node in manifest.nodes.values() if (
+                node.is_relational and not node.is_ephemeral_model
+            )],
             manifest.sources.values(),
         )
         for node in nodes:
@@ -340,9 +342,6 @@ class BaseAdapter(metaclass=AdapterMeta):
         """Populate the relations cache for the given schemas. Returns an
         iterable of the schemas populated, as strings.
         """
-        if not flags.USE_CACHE:
-            return
-
         cache_schemas = self._get_cache_schemas(manifest)
         with executor(self.config) as tpe:
             futures: List[Future[List[BaseRelation]]] = []
@@ -375,9 +374,6 @@ class BaseAdapter(metaclass=AdapterMeta):
         """Run a query that gets a populated cache of the relations in the
         database and set the cache on this adapter.
         """
-        if not flags.USE_CACHE:
-            return
-
         with self.cache.lock:
             if clear:
                 self.cache.clear()
@@ -391,8 +387,7 @@ class BaseAdapter(metaclass=AdapterMeta):
             raise_compiler_error(
                 'Attempted to cache a null relation for {}'.format(name)
             )
-        if flags.USE_CACHE:
-            self.cache.add(relation)
+        self.cache.add(relation)
         # so jinja doesn't render things
         return ''
 
@@ -406,8 +401,7 @@ class BaseAdapter(metaclass=AdapterMeta):
             raise_compiler_error(
                 'Attempted to drop a null relation for {}'.format(name)
             )
-        if flags.USE_CACHE:
-            self.cache.drop(relation)
+        self.cache.drop(relation)
         return ''
 
     @available
@@ -428,8 +422,7 @@ class BaseAdapter(metaclass=AdapterMeta):
                 .format(src_name, dst_name, name)
             )
 
-        if flags.USE_CACHE:
-            self.cache.rename(from_relation, to_relation)
+        self.cache.rename(from_relation, to_relation)
         return ''
 
     ###
@@ -683,9 +676,8 @@ class BaseAdapter(metaclass=AdapterMeta):
         relations = self.list_relations_without_caching(
             schema_relation
         )
+        fire_event(ListRelations(database=database, schema=schema, relations=relations))
 
-        logger.debug('with database={}, schema={}, relations={}'
-                     .format(database, schema, relations))
         return relations
 
     def _make_match_kwargs(
@@ -807,12 +799,11 @@ class BaseAdapter(metaclass=AdapterMeta):
     def quote_seed_column(
         self, column: str, quote_config: Optional[bool]
     ) -> str:
-        # this is the default for now
-        quote_columns: bool = False
+        quote_columns: bool = True
         if isinstance(quote_config, bool):
             quote_columns = quote_config
         elif quote_config is None:
-            deprecations.warn('column-quoting-unset')
+            pass
         else:
             raise_compiler_error(
                 f'The seed configuration value of "quote_columns" has an '
@@ -944,7 +935,6 @@ class BaseAdapter(metaclass=AdapterMeta):
         project: Optional[str] = None,
         context_override: Optional[Dict[str, Any]] = None,
         kwargs: Dict[str, Any] = None,
-        release: bool = False,
         text_only_columns: Optional[Iterable[str]] = None,
     ) -> agate.Table:
         """Look macro_name up in the manifest and execute its results.
@@ -958,10 +948,8 @@ class BaseAdapter(metaclass=AdapterMeta):
             execution context.
         :param kwargs: An optional dict of keyword args used to pass to the
             macro.
-        :param release: Ignored.
         """
-        if release is not False:
-            deprecations.warn('execute-macro-release')
+
         if kwargs is None:
             kwargs = {}
         if context_override is None:
@@ -983,10 +971,10 @@ class BaseAdapter(metaclass=AdapterMeta):
                 'dbt could not find a macro with the name "{}" in {}'
                 .format(macro_name, package_name)
             )
-        # This causes a reference cycle, as generate_runtime_macro()
+        # This causes a reference cycle, as generate_runtime_macro_context()
         # ends up calling get_adapter, so the import has to be here.
-        from dbt.context.providers import generate_runtime_macro
-        macro_context = generate_runtime_macro(
+        from dbt.context.providers import generate_runtime_macro_context
+        macro_context = generate_runtime_macro_context(
             macro=macro,
             config=self.config,
             manifest=manifest,

core/dbt/adapters/cache.py

@@ -1,11 +1,26 @@
+import threading
 from collections import namedtuple
 from copy import deepcopy
-from typing import List, Iterable, Optional, Dict, Set, Tuple, Any
-import threading
+from typing import Any, Dict, Iterable, List, Optional, Set, Tuple
 
-from dbt.logger import CACHE_LOGGER as logger
-from dbt.utils import lowercase
 import dbt.exceptions
+from dbt.events.functions import fire_event
+from dbt.events.types import (
+    AddLink,
+    AddRelation,
+    DropCascade,
+    DropMissingRelation,
+    DropRelation,
+    DumpAfterAddGraph,
+    DumpAfterRenameSchema,
+    DumpBeforeAddGraph,
+    DumpBeforeRenameSchema,
+    RenameSchema,
+    TemporaryRelation,
+    UncachedRelation,
+    UpdateReference
+)
+from dbt.utils import lowercase
 
 _ReferenceKey = namedtuple('_ReferenceKey', 'database schema identifier')
 
@@ -157,12 +172,6 @@ class _CachedRelation:
         return [dot_separated(r) for r in self.referenced_by]
 
 
-def lazy_log(msg, func):
-    if logger.disabled:
-        return
-    logger.debug(msg.format(func()))
-
-
 class RelationsCache:
     """A cache of the relations known to dbt. Keeps track of relationships
     declared between tables and handles renames/drops as a real database would.
@@ -278,6 +287,7 @@ class RelationsCache:
 
         referenced.add_reference(dependent)
 
+    # TODO: Is this dead code?  I can't seem to find it grepping the codebase.
     def add_link(self, referenced, dependent):
         """Add a link between two relations to the database. If either relation
         does not exist, it will be added as an "external" relation.
@@ -297,11 +307,7 @@ class RelationsCache:
             # if we have not cached the referenced schema at all, we must be
             # referring to a table outside our control. There's no need to make
             # a link - we will never drop the referenced relation during a run.
-            logger.debug(
-                '{dep!s} references {ref!s} but {ref.database}.{ref.schema} '
-                'is not in the cache, skipping assumed external relation'
-                .format(dep=dependent, ref=ref_key)
-            )
+            fire_event(UncachedRelation(dep_key=dependent, ref_key=ref_key))
             return
         if ref_key not in self.relations:
             # Insert a dummy "external" relation.
@@ -317,9 +323,7 @@ class RelationsCache:
                 type=referenced.External
             )
             self.add(dependent)
-        logger.debug(
-            'adding link, {!s} references {!s}'.format(dep_key, ref_key)
-        )
+        fire_event(AddLink(dep_key=dep_key, ref_key=ref_key))
         with self.lock:
             self._add_link(ref_key, dep_key)
 
@@ -330,14 +334,12 @@ class RelationsCache:
         :param BaseRelation relation: The underlying relation.
         """
         cached = _CachedRelation(relation)
-        logger.debug('Adding relation: {!s}'.format(cached))
-
-        lazy_log('before adding: {!s}', self.dump_graph)
+        fire_event(AddRelation(relation=cached))
+        fire_event(DumpBeforeAddGraph(graph_func=self.dump_graph))
 
         with self.lock:
             self._setdefault(cached)
-
-        lazy_log('after adding: {!s}', self.dump_graph)
+        fire_event(DumpAfterAddGraph(graph_func=self.dump_graph))
 
     def _remove_refs(self, keys):
         """Removes all references to all entries in keys. This does not
@@ -359,13 +361,10 @@ class RelationsCache:
         :param _CachedRelation dropped: An existing _CachedRelation to drop.
         """
         if dropped not in self.relations:
-            logger.debug('dropped a nonexistent relationship: {!s}'
-                         .format(dropped))
+            fire_event(DropMissingRelation(relation=dropped))
             return
         consequences = self.relations[dropped].collect_consequences()
-        logger.debug(
-            'drop {} is cascading to {}'.format(dropped, consequences)
-        )
+        fire_event(DropCascade(dropped=dropped, consequences=consequences))
         self._remove_refs(consequences)
 
     def drop(self, relation):
@@ -380,7 +379,7 @@ class RelationsCache:
         :param str identifier: The identifier of the relation to drop.
         """
         dropped = _make_key(relation)
-        logger.debug('Dropping relation: {!s}'.format(dropped))
+        fire_event(DropRelation(dropped=dropped))
         with self.lock:
             self._drop_cascade_relation(dropped)
 
@@ -403,9 +402,8 @@ class RelationsCache:
         # update all the relations that refer to it
         for cached in self.relations.values():
             if cached.is_referenced_by(old_key):
-                logger.debug(
-                    'updated reference from {0} -> {2} to {1} -> {2}'
-                    .format(old_key, new_key, cached.key())
+                fire_event(
+                    UpdateReference(old_key=old_key, new_key=new_key, cached_key=cached.key())
                 )
                 cached.rename_key(old_key, new_key)
 
@@ -435,10 +433,7 @@ class RelationsCache:
             )
 
         if old_key not in self.relations:
-            logger.debug(
-                'old key {} not found in self.relations, assuming temporary'
-                .format(old_key)
-            )
+            fire_event(TemporaryRelation(key=old_key))
             return False
         return True
 
@@ -456,11 +451,9 @@ class RelationsCache:
         """
         old_key = _make_key(old)
         new_key = _make_key(new)
-        logger.debug('Renaming relation {!s} to {!s}'.format(
-            old_key, new_key
-        ))
+        fire_event(RenameSchema(old_key=old_key, new_key=new_key))
 
-        lazy_log('before rename: {!s}', self.dump_graph)
+        fire_event(DumpBeforeRenameSchema(graph_func=self.dump_graph))
 
         with self.lock:
             if self._check_rename_constraints(old_key, new_key):
@@ -468,7 +461,7 @@ class RelationsCache:
             else:
                 self._setdefault(_CachedRelation(new))
 
-        lazy_log('after rename: {!s}', self.dump_graph)
+        fire_event(DumpAfterRenameSchema(graph_func=self.dump_graph))
 
     def get_relations(
         self, database: Optional[str], schema: Optional[str]

core/dbt/adapters/factory.py

@@ -8,10 +8,9 @@ from dbt.include.global_project import (
     PACKAGE_PATH as GLOBAL_PROJECT_PATH,
     PROJECT_NAME as GLOBAL_PROJECT_NAME,
 )
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import AdapterImportError, PluginLoadError
 from dbt.contracts.connection import Credentials, AdapterRequiredConfig
-
-
 from dbt.adapters.protocol import (
     AdapterProtocol,
     AdapterConfig,
@@ -67,11 +66,12 @@ class AdapterContainer:
             # if we failed to import the target module in particular, inform
             # the user about it via a runtime error
             if exc.name == 'dbt.adapters.' + name:
+                fire_event(AdapterImportError(exc=exc))
                 raise RuntimeException(f'Could not find adapter type {name}!')
-            logger.info(f'Error importing adapter: {exc}')
             # otherwise, the error had to have come from some underlying
             # library. Log the stack trace.
-            logger.debug('', exc_info=True)
+
+            fire_event(PluginLoadError())
             raise
         plugin: AdapterPlugin = mod.Plugin
         plugin_type = plugin.adapter.type()

core/dbt/adapters/sql/connections.py

@@ -10,8 +10,8 @@ from dbt.adapters.base import BaseConnectionManager
 from dbt.contracts.connection import (
     Connection, ConnectionState, AdapterResponse
 )
-from dbt.logger import GLOBAL_LOGGER as logger
-from dbt import flags
+from dbt.events.functions import fire_event
+from dbt.events.types import ConnectionUsed, SQLQuery, SQLCommit, SQLQueryStatus
 
 
 class SQLConnectionManager(BaseConnectionManager):
@@ -59,9 +59,7 @@ class SQLConnectionManager(BaseConnectionManager):
         connection = self.get_thread_connection()
         if auto_begin and connection.transaction_open is False:
             self.begin()
-
-        logger.debug('Using {} connection "{}".'
-                     .format(self.TYPE, connection.name))
+        fire_event(ConnectionUsed(conn_type=self.TYPE, conn_name=connection.name))
 
         with self.exception_handler(sql):
             if abridge_sql_log:
@@ -69,19 +67,16 @@ class SQLConnectionManager(BaseConnectionManager):
             else:
                 log_sql = sql
 
-            logger.debug(
-                'On {connection_name}: {sql}',
-                connection_name=connection.name,
-                sql=log_sql,
-            )
+            fire_event(SQLQuery(conn_name=connection.name, sql=log_sql))
             pre = time.time()
 
             cursor = connection.handle.cursor()
             cursor.execute(sql, bindings)
-            logger.debug(
-                "SQL status: {status} in {elapsed:0.2f} seconds",
-                status=self.get_response(cursor),
-                elapsed=(time.time() - pre)
+
+            fire_event(
+                SQLQueryStatus(
+                    status=self.get_response(cursor), elapsed=round((time.time() - pre), 2)
+                )
             )
 
             return connection, cursor
@@ -144,13 +139,6 @@ class SQLConnectionManager(BaseConnectionManager):
 
     def begin(self):
         connection = self.get_thread_connection()
-
-        if flags.STRICT_MODE:
-            if not isinstance(connection, Connection):
-                raise dbt.exceptions.CompilerException(
-                    f'In begin, got {connection} - not a Connection!'
-                )
-
         if connection.transaction_open is True:
             raise dbt.exceptions.InternalException(
                 'Tried to begin a new transaction on connection "{}", but '
@@ -163,18 +151,12 @@ class SQLConnectionManager(BaseConnectionManager):
 
     def commit(self):
         connection = self.get_thread_connection()
-        if flags.STRICT_MODE:
-            if not isinstance(connection, Connection):
-                raise dbt.exceptions.CompilerException(
-                    f'In commit, got {connection} - not a Connection!'
-                )
-
         if connection.transaction_open is False:
             raise dbt.exceptions.InternalException(
                 'Tried to commit transaction on connection "{}", but '
                 'it does not have one open!'.format(connection.name))
 
-        logger.debug('On {}: COMMIT'.format(connection.name))
+        fire_event(SQLCommit(conn_name=connection.name))
         self.add_commit_query()
 
         connection.transaction_open = False

core/dbt/adapters/sql/impl.py

@@ -6,7 +6,9 @@ from dbt.contracts.connection import Connection
 import dbt.exceptions
 from dbt.adapters.base import BaseAdapter, available
 from dbt.adapters.sql import SQLConnectionManager
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import ColTypeChange, SchemaCreation, SchemaDrop
+
 
 from dbt.adapters.base.relation import BaseRelation
 
@@ -116,8 +118,13 @@ class SQLAdapter(BaseAdapter):
                target_column.can_expand_to(reference_column):
                 col_string_size = reference_column.string_size()
                 new_type = self.Column.string_type(col_string_size)
-                logger.debug("Changing col type from {} to {} in table {}",
-                             target_column.data_type, new_type, current)
+                fire_event(
+                    ColTypeChange(
+                        orig_type=target_column.data_type,
+                        new_type=new_type,
+                        table=current,
+                    )
+                )
 
                 self.alter_column_type(current, column_name, new_type)
 
@@ -175,7 +182,7 @@ class SQLAdapter(BaseAdapter):
 
     def create_schema(self, relation: BaseRelation) -> None:
         relation = relation.without_identifier()
-        logger.debug('Creating schema "{}"', relation)
+        fire_event(SchemaCreation(relation=relation))
         kwargs = {
             'relation': relation,
         }
@@ -186,7 +193,7 @@ class SQLAdapter(BaseAdapter):
 
     def drop_schema(self, relation: BaseRelation) -> None:
         relation = relation.without_identifier()
-        logger.debug('Dropping schema "{}".', relation)
+        fire_event(SchemaDrop(relation=relation))
         kwargs = {
             'relation': relation,
         }

core/dbt/clients/gcloud.py

@@ -1,26 +0,0 @@
-from dbt.logger import GLOBAL_LOGGER as logger
-import dbt.exceptions
-from dbt.clients.system import run_cmd
-
-NOT_INSTALLED_MSG = """
-dbt requires the gcloud SDK to be installed to authenticate with BigQuery.
-Please download and install the SDK, or use a Service Account instead.
-
-https://cloud.google.com/sdk/
-"""
-
-
-def gcloud_installed():
-    try:
-        run_cmd('.', ['gcloud', '--version'])
-        return True
-    except OSError as e:
-        logger.debug(e)
-        return False
-
-
-def setup_default_credentials():
-    if gcloud_installed():
-        run_cmd('.', ["gcloud", "auth", "application-default", "login"])
-    else:
-        raise dbt.exceptions.RuntimeException(NOT_INSTALLED_MSG)

core/dbt/clients/git.py

@@ -2,7 +2,12 @@ import re
 import os.path
 
 from dbt.clients.system import run_cmd, rmdir
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import (
+    GitSparseCheckoutSubdirectory, GitProgressCheckoutRevision,
+    GitProgressUpdatingExistingDependency, GitProgressPullingNewDependency,
+    GitNothingToDo, GitProgressUpdatedCheckoutRange, GitProgressCheckedOutAt
+)
 import dbt.exceptions
 from packaging import version
 
@@ -12,13 +17,23 @@ def _is_commit(revision: str) -> bool:
     return bool(re.match(r"\b[0-9a-f]{40}\b", revision))
 
 
+def _raise_git_cloning_error(repo, revision, error):
+    stderr = error.stderr.decode('utf-8').strip()
+    if 'usage: git' in stderr:
+        stderr = stderr.split('\nusage: git')[0]
+    if re.match("fatal: destination path '(.+)' already exists", stderr):
+        raise error
+
+    dbt.exceptions.bad_package_spec(repo, revision, stderr)
+
+
 def clone(repo, cwd, dirname=None, remove_git_dir=False, revision=None, subdirectory=None):
     has_revision = revision is not None
     is_commit = _is_commit(revision or "")
 
     clone_cmd = ['git', 'clone', '--depth', '1']
     if subdirectory:
-        logger.debug('  Subdirectory specified: {}, using sparse checkout.'.format(subdirectory))
+        fire_event(GitSparseCheckoutSubdirectory(subdir=subdirectory))
         out, _ = run_cmd(cwd, ['git', '--version'], env={'LC_ALL': 'C'})
         git_version = version.parse(re.search(r"\d+\.\d+\.\d+", out.decode("utf-8")).group(0))
         if not git_version >= version.parse("2.25.0"):
@@ -36,10 +51,18 @@ def clone(repo, cwd, dirname=None, remove_git_dir=False, revision=None, subdirec
 
     if dirname is not None:
         clone_cmd.append(dirname)
-    result = run_cmd(cwd, clone_cmd, env={'LC_ALL': 'C'})
+    try:
+        result = run_cmd(cwd, clone_cmd, env={'LC_ALL': 'C'})
+    except dbt.exceptions.CommandResultError as exc:
+        _raise_git_cloning_error(repo, revision, exc)
 
     if subdirectory:
-        run_cmd(os.path.join(cwd, dirname or ''), ['git', 'sparse-checkout', 'set', subdirectory])
+        cwd_subdir = os.path.join(cwd, dirname or '')
+        clone_cmd_subdir = ['git', 'sparse-checkout', 'set', subdirectory]
+        try:
+            run_cmd(cwd_subdir, clone_cmd_subdir)
+        except dbt.exceptions.CommandResultError as exc:
+            _raise_git_cloning_error(repo, revision, exc)
 
     if remove_git_dir:
         rmdir(os.path.join(dirname, '.git'))
@@ -54,7 +77,7 @@ def list_tags(cwd):
 
 
 def _checkout(cwd, repo, revision):
-    logger.debug('  Checking out revision {}.'.format(revision))
+    fire_event(GitProgressCheckoutRevision(revision=revision))
 
     fetch_cmd = ["git", "fetch", "origin", "--depth", "1"]
 
@@ -111,14 +134,17 @@ def clone_and_checkout(repo, cwd, dirname=None, remove_git_dir=False,
     except dbt.exceptions.CommandResultError as exc:
         err = exc.stderr.decode('utf-8')
         exists = re.match("fatal: destination path '(.+)' already exists", err)
-        if not exists:  # something else is wrong, raise it
+        if not exists:
+            print(
+                '\nSomething went wrong while cloning {}'.format(repo) +
+                '\nCheck the debug logs for more information')
             raise
 
     directory = None
     start_sha = None
     if exists:
         directory = exists.group(1)
-        logger.debug('Updating existing dependency {}.', directory)
+        fire_event(GitProgressUpdatingExistingDependency(dir=directory))
     else:
         matches = re.match("Cloning into '(.+)'", err.decode('utf-8'))
         if matches is None:
@@ -126,17 +152,18 @@ def clone_and_checkout(repo, cwd, dirname=None, remove_git_dir=False,
                 f'Error cloning {repo} - never saw "Cloning into ..." from git'
             )
         directory = matches.group(1)
-        logger.debug('Pulling new dependency {}.', directory)
+        fire_event(GitProgressPullingNewDependency(dir=directory))
     full_path = os.path.join(cwd, directory)
     start_sha = get_current_sha(full_path)
     checkout(full_path, repo, revision)
     end_sha = get_current_sha(full_path)
     if exists:
         if start_sha == end_sha:
-            logger.debug('  Already at {}, nothing to do.', start_sha[:7])
+            fire_event(GitNothingToDo(sha=start_sha[:7]))
         else:
-            logger.debug('  Updated checkout from {} to {}.',
-                         start_sha[:7], end_sha[:7])
+            fire_event(GitProgressUpdatedCheckoutRange(
+                start_sha=start_sha[:7], end_sha=end_sha[:7]
+            ))
     else:
-        logger.debug('  Checked out at {}.', end_sha[:7])
+        fire_event(GitProgressCheckedOutAt(end_sha=end_sha[:7]))
     return os.path.join(directory, subdirectory or '')

core/dbt/clients/jinja.py

@@ -21,19 +21,18 @@ import jinja2.sandbox
 
 from dbt.utils import (
     get_dbt_macro_name, get_docs_macro_name, get_materialization_macro_name,
-    get_test_macro_name, deep_map
+    get_test_macro_name, deep_map_render
 )
 
 from dbt.clients._jinja_blocks import BlockIterator, BlockData, BlockTag
-from dbt.contracts.graph.compiled import CompiledSchemaTestNode
-from dbt.contracts.graph.parsed import ParsedSchemaTestNode
+from dbt.contracts.graph.compiled import CompiledGenericTestNode
+from dbt.contracts.graph.parsed import ParsedGenericTestNode
 from dbt.exceptions import (
     InternalException, raise_compiler_error, CompilationException,
     invalid_materialization_argument, MacroReturn, JinjaRenderingException,
     UndefinedMacroException
 )
 from dbt import flags
-from dbt.logger import GLOBAL_LOGGER as logger  # noqa
 
 
 def _linecache_inject(source, write):
@@ -627,12 +626,12 @@ def extract_toplevel_blocks(
     )
 
 
-SCHEMA_TEST_KWARGS_NAME = '_dbt_schema_test_kwargs'
+GENERIC_TEST_KWARGS_NAME = '_dbt_generic_test_kwargs'
 
 
 def add_rendered_test_kwargs(
     context: Dict[str, Any],
-    node: Union[ParsedSchemaTestNode, CompiledSchemaTestNode],
+    node: Union[ParsedGenericTestNode, CompiledGenericTestNode],
     capture_macros: bool = False,
 ) -> None:
     """Render each of the test kwargs in the given context using the native
@@ -661,5 +660,7 @@ def add_rendered_test_kwargs(
 
         return value
 
-    kwargs = deep_map(_convert_function, node.test_metadata.kwargs)
-    context[SCHEMA_TEST_KWARGS_NAME] = kwargs
+    # The test_metadata.kwargs come from the test builder, and were set
+    # when the test node was created in _parse_generic_test.
+    kwargs = deep_map_render(_convert_function, node.test_metadata.kwargs)
+    context[GENERIC_TEST_KWARGS_NAME] = kwargs

core/dbt/clients/jinja_static.py

@@ -96,7 +96,6 @@ def statically_parse_adapter_dispatch(func_call, ctx, db_wrapper):
         possible_macro_calls.append(func_name)
 
     # packages positional argument
-    packages = None
     macro_namespace = None
     packages_arg = None
     packages_arg_type = None
@@ -109,13 +108,7 @@ def statically_parse_adapter_dispatch(func_call, ctx, db_wrapper):
     # keyword arguments
     if func_call.kwargs:
         for kwarg in func_call.kwargs:
-            if kwarg.key == 'packages':
-                # The packages keyword will be deprecated and
-                # eventually removed
-                packages_arg = kwarg.value
-                # This can be a List or a Call
-                packages_arg_type = type(kwarg.value).__name__
-            elif kwarg.key == 'macro_name':
+            if kwarg.key == 'macro_name':
                 # This will remain to enable static resolution
                 if type(kwarg.value).__name__ == 'Const':
                     func_name = kwarg.value.value
@@ -142,63 +135,10 @@ def statically_parse_adapter_dispatch(func_call, ctx, db_wrapper):
         elif packages_arg_type == 'Const':
             # This will remain to enable static resolution
             macro_namespace = packages_arg.value
-        elif packages_arg_type == 'Call':
-            # This is deprecated and should be removed eventually.
-            # It is here to support (hackily) common ways of providing
-            # a packages list to adapter.dispatch
-            if (hasattr(packages_arg, 'node') and
-                    hasattr(packages_arg.node, 'node') and
-                    hasattr(packages_arg.node.node, 'name') and
-                    hasattr(packages_arg.node, 'attr')):
-                package_name = packages_arg.node.node.name
-                macro_name = packages_arg.node.attr
-                if (macro_name.startswith('_get') and 'namespaces' in macro_name):
-                    # noqa: https://github.com/dbt-labs/dbt-utils/blob/9e9407b/macros/cross_db_utils/_get_utils_namespaces.sql
-                    var_name = f'{package_name}_dispatch_list'
-                    # hard code compatibility for fivetran_utils, just a teensy bit different
-                    # noqa: https://github.com/fivetran/dbt_fivetran_utils/blob/0978ba2/macros/_get_utils_namespaces.sql
-                    if package_name == 'fivetran_utils':
-                        default_packages = ['dbt_utils', 'fivetran_utils']
-                    else:
-                        default_packages = [package_name]
-
-                    namespace_names = get_dispatch_list(ctx, var_name, default_packages)
-                    packages = []
-                    if namespace_names:
-                        packages.extend(namespace_names)
-                else:
-                    msg = (
-                        f"As of v0.19.2, custom macros, such as '{macro_name}', are no longer "
-                        "supported in the 'packages' argument of 'adapter.dispatch()'.\n"
-                        f"See https://docs.getdbt.com/reference/dbt-jinja-functions/dispatch "
-                        "for details."
-                    ).strip()
-                    raise_compiler_error(msg)
-        elif packages_arg_type == 'Add':
-            # This logic is for when there is a variable and an addition of a list,
-            # like: packages = (var('local_utils_dispatch_list', []) + ['local_utils2'])
-            # This is deprecated and should be removed eventually.
-            namespace_var = None
-            default_namespaces = []
-            # This might be a single call or it might be the 'left' piece in an addition
-            for var_call in packages_arg.find_all(jinja2.nodes.Call):
-                if (hasattr(var_call, 'node') and
-                        var_call.node.name == 'var' and
-                        hasattr(var_call, 'args')):
-                    namespace_var = var_call.args[0].value
-            if hasattr(packages_arg, 'right'):  # we have a default list of namespaces
-                for item in packages_arg.right.items:
-                    default_namespaces.append(item.value)
-            if namespace_var:
-                namespace_names = get_dispatch_list(ctx, namespace_var, default_namespaces)
-                packages = []
-                if namespace_names:
-                    packages.extend(namespace_names)
 
     if db_wrapper:
         macro = db_wrapper.dispatch(
             func_name,
-            packages=packages,
             macro_namespace=macro_namespace
         ).macro
         func_name = f'{macro.package_name}.{macro.name}'
@@ -206,20 +146,9 @@ def statically_parse_adapter_dispatch(func_call, ctx, db_wrapper):
     else:  # this is only for test/unit/test_macro_calls.py
         if macro_namespace:
             packages = [macro_namespace]
-        if packages is None:
+        else:
             packages = []
         for package_name in packages:
             possible_macro_calls.append(f'{package_name}.{func_name}')
 
     return possible_macro_calls
-
-
-def get_dispatch_list(ctx, var_name, default_packages):
-    namespace_list = None
-    try:
-        # match the logic currently used in package _get_namespaces() macro
-        namespace_list = ctx['var'](var_name) + default_packages
-    except Exception:
-        pass
-    namespace_list = namespace_list if namespace_list else default_packages
-    return namespace_list

core/dbt/clients/registry.py

@@ -1,7 +1,11 @@
 import functools
 import requests
+from dbt.events.functions import fire_event
+from dbt.events.types import (
+    RegistryProgressMakingGETRequest,
+    RegistryProgressGETResponse
+)
 from dbt.utils import memoized, _connection_exception_retry as connection_exception_retry
-from dbt.logger import GLOBAL_LOGGER as logger
 from dbt import deprecations
 import os
 
@@ -25,11 +29,14 @@ def _get_with_retries(path, registry_base_url=None):
 
 def _get(path, registry_base_url=None):
     url = _get_url(path, registry_base_url)
-    logger.debug('Making package registry request: GET {}'.format(url))
+    fire_event(RegistryProgressMakingGETRequest(url=url))
     resp = requests.get(url, timeout=30)
-    logger.debug('Response from registry: GET {} {}'.format(url,
-                                                            resp.status_code))
+    fire_event(RegistryProgressGETResponse(url=url, resp_code=resp.status_code))
     resp.raise_for_status()
+    if resp is None:
+        raise requests.exceptions.ContentDecodingError(
+            'Request error: The response is None', response=resp
+        )
     return resp.json()
 
 

core/dbt/clients/system.py

@@ -15,8 +15,12 @@ from typing import (
     Type, NoReturn, List, Optional, Dict, Any, Tuple, Callable, Union
 )
 
+from dbt.events.functions import fire_event
+from dbt.events.types import (
+    SystemErrorRetrievingModTime, SystemCouldNotWrite, SystemExecutingCmd, SystemStdOutMsg,
+    SystemStdErrMsg, SystemReportReturnCode
+)
 import dbt.exceptions
-from dbt.logger import GLOBAL_LOGGER as logger
 from dbt.utils import _connection_exception_retry as connection_exception_retry
 
 if sys.platform == 'win32':
@@ -65,9 +69,7 @@ def find_matching(
                 try:
                     modification_time = os.path.getmtime(absolute_path)
                 except OSError:
-                    logger.exception(
-                        f"Error retrieving modification time for file {absolute_path}"
-                    )
+                    fire_event(SystemErrorRetrievingModTime(path=absolute_path))
                 if reobj.match(local_file):
                     matching.append({
                         'searched_path': relative_path_to_search,
@@ -161,10 +163,7 @@ def write_file(path: str, contents: str = '') -> bool:
                 reason = 'Path was possibly too long'
             # all our hard work and the path was still too long. Log and
             # continue.
-            logger.debug(
-                f'Could not write to path {path}({len(path)} characters): '
-                f'{reason}\nexception: {exc}'
-            )
+            fire_event(SystemCouldNotWrite(path=path, reason=reason, exc=exc))
         else:
             raise
     return True
@@ -412,7 +411,7 @@ def _interpret_oserror(exc: OSError, cwd: str, cmd: List[str]) -> NoReturn:
 def run_cmd(
     cwd: str, cmd: List[str], env: Optional[Dict[str, Any]] = None
 ) -> Tuple[bytes, bytes]:
-    logger.debug('Executing "{}"'.format(' '.join(cmd)))
+    fire_event(SystemExecutingCmd(cmd=cmd))
     if len(cmd) == 0:
         raise dbt.exceptions.CommandError(cwd, cmd)
 
@@ -438,11 +437,11 @@ def run_cmd(
     except OSError as exc:
         _interpret_oserror(exc, cwd, cmd)
 
-    logger.debug('STDOUT: "{!s}"'.format(out))
-    logger.debug('STDERR: "{!s}"'.format(err))
+    fire_event(SystemStdOutMsg(bmsg=out))
+    fire_event(SystemStdErrMsg(bmsg=err))
 
     if proc.returncode != 0:
-        logger.debug('command return code={}'.format(proc.returncode))
+        fire_event(SystemReportReturnCode(code=proc.returncode))
         raise dbt.exceptions.CommandResultError(cwd, cmd, proc.returncode,
                                                 out, err)
 

core/dbt/clients/yaml_helper.py

@@ -1,7 +1,6 @@
 import dbt.exceptions
 from typing import Any, Dict, Optional
 import yaml
-import yaml.scanner
 
 # the C version is faster, but it doesn't always exist
 try:

core/dbt/compilation.py

@@ -9,11 +9,11 @@ from dbt import flags
 from dbt.adapters.factory import get_adapter
 from dbt.clients import jinja
 from dbt.clients.system import make_directory
-from dbt.context.providers import generate_runtime_model
+from dbt.context.providers import generate_runtime_model_context
 from dbt.contracts.graph.manifest import Manifest, UniqueID
 from dbt.contracts.graph.compiled import (
     COMPILED_TYPES,
-    CompiledSchemaTestNode,
+    CompiledGenericTestNode,
     GraphMemberNode,
     InjectedCTE,
     ManifestNode,
@@ -26,9 +26,10 @@ from dbt.exceptions import (
     RuntimeException,
 )
 from dbt.graph import Graph
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import FoundStats, CompilingNode, WritingInjectedSQLForNode
 from dbt.node_types import NodeType
-from dbt.utils import pluralize
+from dbt.events.format import pluralize
 import dbt.tracking
 
 graph_file_name = 'graph.gpickle'
@@ -53,6 +54,7 @@ def print_compile_stats(stats):
         NodeType.Seed: 'seed file',
         NodeType.Source: 'source',
         NodeType.Exposure: 'exposure',
+        NodeType.Metric: 'metric'
     }
 
     results = {k: 0 for k in names.keys()}
@@ -68,7 +70,7 @@ def print_compile_stats(stats):
         if t in names
     ])
 
-    logger.info("Found {}".format(stat_line))
+    fire_event(FoundStats(stat_line=stat_line))
 
 
 def _node_enabled(node: ManifestNode):
@@ -111,12 +113,13 @@ def _get_tests_for_node(manifest: Manifest, unique_id: UniqueID) -> List[UniqueI
     """ Get a list of tests that depend on the node with the
     provided unique id """
 
-    return [
-        node.unique_id
-        for _, node in manifest.nodes.items()
-        if node.resource_type == NodeType.Test and
-        unique_id in node.depends_on_nodes
-    ]
+    tests = []
+    if unique_id in manifest.child_map:
+        for child_unique_id in manifest.child_map[unique_id]:
+            if child_unique_id.startswith('test.'):
+                tests.append(child_unique_id)
+
+    return tests
 
 
 class Linker:
@@ -166,7 +169,7 @@ class Compiler:
 
     def initialize(self):
         make_directory(self.config.target_path)
-        make_directory(self.config.modules_path)
+        make_directory(self.config.packages_install_path)
 
     # creates a ModelContext which is converted to
     # a dict for jinja rendering of SQL
@@ -177,11 +180,11 @@ class Compiler:
         extra_context: Dict[str, Any],
     ) -> Dict[str, Any]:
 
-        context = generate_runtime_model(
+        context = generate_runtime_model_context(
             node, self.config, manifest
         )
         context.update(extra_context)
-        if isinstance(node, CompiledSchemaTestNode):
+        if isinstance(node, CompiledGenericTestNode):
             # for test nodes, add a special keyword args value to the context
             jinja.add_rendered_test_kwargs(context, node)
 
@@ -365,7 +368,7 @@ class Compiler:
         if extra_context is None:
             extra_context = {}
 
-        logger.debug("Compiling {}".format(node.unique_id))
+        fire_event(CompilingNode(unique_id=node.unique_id))
 
         data = node.to_dict(omit_none=True)
         data.update({
@@ -417,40 +420,44 @@ class Compiler:
             else:
                 dependency_not_found(node, dependency)
 
-    def link_graph(self, linker: Linker, manifest: Manifest):
+    def link_graph(self, linker: Linker, manifest: Manifest, add_test_edges: bool = False):
         for source in manifest.sources.values():
             linker.add_node(source.unique_id)
         for node in manifest.nodes.values():
             self.link_node(linker, node, manifest)
         for exposure in manifest.exposures.values():
             self.link_node(linker, exposure, manifest)
+        for metric in manifest.metrics.values():
+            self.link_node(linker, metric, manifest)
 
         cycle = linker.find_cycles()
 
         if cycle:
             raise RuntimeError("Found a cycle: {}".format(cycle))
 
-        self.resolve_graph(linker, manifest)
+        if add_test_edges:
+            manifest.build_parent_and_child_maps()
+            self.add_test_edges(linker, manifest)
 
-    def resolve_graph(self, linker: Linker, manifest: Manifest) -> None:
+    def add_test_edges(self, linker: Linker, manifest: Manifest) -> None:
         """ This method adds additional edges to the DAG. For a given non-test
         executable node, add an edge from an upstream test to the given node if
-        the set of nodes the test depends on is a proper/strict subset of the
-        upstream nodes for the given node. """
+        the set of nodes the test depends on is a subset of the upstream nodes
+        for the given node. """
 
         # Given a graph:
         # model1 --> model2 --> model3
-        #   |         |
-        #   |        \/
-        #  \/      test 2
+        #   |             |
+        #   |            \/
+        #  \/          test 2
         # test1
         #
         # Produce the following graph:
         # model1 --> model2 --> model3
-        #   |         |         /\ /\
-        #   |        \/         |  |
-        #  \/      test2 -------   |
-        # test1 -------------------
+        #   |       /\    |      /\ /\
+        #   |       |    \/      |  |
+        #  \/       |  test2 ----|  |
+        # test1 ----|---------------|
 
         for node_id in linker.graph:
             # If node is executable (in manifest.nodes) and does _not_
@@ -488,21 +495,19 @@ class Compiler:
                     )
 
                     # If the set of nodes that an upstream test depends on
-                    # is a proper (or strict) subset of all upstream nodes of
-                    # the current node, add an edge from the upstream test
-                    # to the current node. Must be a proper/strict subset to
-                    # avoid adding a circular dependency to the graph.
-                    if (test_depends_on < upstream_nodes):
+                    # is a subset of all upstream nodes of the current node,
+                    # add an edge from the upstream test to the current node.
+                    if (test_depends_on.issubset(upstream_nodes)):
                         linker.graph.add_edge(
                             upstream_test,
                             node_id
                         )
 
-    def compile(self, manifest: Manifest, write=True) -> Graph:
+    def compile(self, manifest: Manifest, write=True, add_test_edges=False) -> Graph:
         self.initialize()
         linker = Linker()
 
-        self.link_graph(linker, manifest)
+        self.link_graph(linker, manifest, add_test_edges)
 
         stats = _generate_stats(manifest)
 
@@ -517,7 +522,7 @@ class Compiler:
         if (not node.extra_ctes_injected or
                 node.resource_type == NodeType.Snapshot):
             return node
-        logger.debug(f'Writing injected SQL for node "{node.unique_id}"')
+        fire_event(WritingInjectedSQLForNode(unique_id=node.unique_id))
 
         if node.compiled_sql:
             node.compiled_path = node.write_node(

core/dbt/config/__init__.py

@@ -1,4 +1,4 @@
 # all these are just exports, they need "noqa" so flake8 will not complain.
-from .profile import Profile, PROFILES_DIR, read_user_config  # noqa
+from .profile import Profile, read_user_config  # noqa
 from .project import Project, IsFQNResource  # noqa
 from .runtime import RuntimeConfig, UnsetProfileConfig  # noqa

core/dbt/config/profile.py

@@ -4,6 +4,7 @@ import os
 
 from dbt.dataclass_schema import ValidationError
 
+from dbt import flags
 from dbt.clients.system import load_file_contents
 from dbt.clients.yaml_helper import load_yaml_text
 from dbt.contracts.connection import Credentials, HasCredentials
@@ -14,16 +15,15 @@ from dbt.exceptions import DbtProjectError
 from dbt.exceptions import ValidationException
 from dbt.exceptions import RuntimeException
 from dbt.exceptions import validator_error_message
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.types import MissingProfileTarget
+from dbt.events.functions import fire_event
 from dbt.utils import coerce_dict_str
 
 from .renderer import ProfileRenderer
 
 DEFAULT_THREADS = 1
+
 DEFAULT_PROFILES_DIR = os.path.join(os.path.expanduser('~'), '.dbt')
-PROFILES_DIR = os.path.expanduser(
-    os.getenv('DBT_PROFILES_DIR', DEFAULT_PROFILES_DIR)
-)
 
 INVALID_PROFILE_MESSAGE = """
 dbt encountered an error while trying to read your profiles.yml file.
@@ -43,7 +43,7 @@ Here, [profile name] should be replaced with a profile name
 defined in your profiles.yml file. You can find profiles.yml here:
 
 {profiles_file}/profiles.yml
-""".format(profiles_file=PROFILES_DIR)
+""".format(profiles_file=DEFAULT_PROFILES_DIR)
 
 
 def read_profile(profiles_dir: str) -> Dict[str, Any]:
@@ -73,10 +73,10 @@ def read_user_config(directory: str) -> UserConfig:
     try:
         profile = read_profile(directory)
         if profile:
-            user_cfg = coerce_dict_str(profile.get('config', {}))
-            if user_cfg is not None:
-                UserConfig.validate(user_cfg)
-                return UserConfig.from_dict(user_cfg)
+            user_config = coerce_dict_str(profile.get('config', {}))
+            if user_config is not None:
+                UserConfig.validate(user_config)
+                return UserConfig.from_dict(user_config)
     except (RuntimeException, ValidationError):
         pass
     return UserConfig()
@@ -89,15 +89,16 @@ def read_user_config(directory: str) -> UserConfig:
 class Profile(HasCredentials):
     profile_name: str
     target_name: str
-    config: UserConfig
+    user_config: UserConfig
     threads: int
     credentials: Credentials
+    profile_env_vars: Dict[str, Any]
 
     def __init__(
         self,
         profile_name: str,
         target_name: str,
-        config: UserConfig,
+        user_config: UserConfig,
         threads: int,
         credentials: Credentials
     ):
@@ -106,9 +107,10 @@ class Profile(HasCredentials):
         """
         self.profile_name = profile_name
         self.target_name = target_name
-        self.config = config
+        self.user_config = user_config
         self.threads = threads
         self.credentials = credentials
+        self.profile_env_vars = {}  # never available on init
 
     def to_profile_info(
         self, serialize_credentials: bool = False
@@ -124,12 +126,12 @@ class Profile(HasCredentials):
         result = {
             'profile_name': self.profile_name,
             'target_name': self.target_name,
-            'config': self.config,
+            'user_config': self.user_config,
             'threads': self.threads,
             'credentials': self.credentials,
         }
         if serialize_credentials:
-            result['config'] = self.config.to_dict(omit_none=True)
+            result['user_config'] = self.user_config.to_dict(omit_none=True)
             result['credentials'] = self.credentials.to_dict(omit_none=True)
         return result
 
@@ -143,7 +145,7 @@ class Profile(HasCredentials):
             'name': self.target_name,
             'target_name': self.target_name,
             'profile_name': self.profile_name,
-            'config': self.config.to_dict(omit_none=True),
+            'config': self.user_config.to_dict(omit_none=True),
         })
         return target
 
@@ -238,7 +240,7 @@ class Profile(HasCredentials):
         threads: int,
         profile_name: str,
         target_name: str,
-        user_cfg: Optional[Dict[str, Any]] = None
+        user_config: Optional[Dict[str, Any]] = None
     ) -> 'Profile':
         """Create a profile from an existing set of Credentials and the
         remaining information.
@@ -247,20 +249,20 @@ class Profile(HasCredentials):
         :param threads: The number of threads to use for connections.
         :param profile_name: The profile name used for this profile.
         :param target_name: The target name used for this profile.
-        :param user_cfg: The user-level config block from the
+        :param user_config: The user-level config block from the
             raw profiles, if specified.
         :raises DbtProfileError: If the profile is invalid.
         :returns: The new Profile object.
         """
-        if user_cfg is None:
-            user_cfg = {}
-        UserConfig.validate(user_cfg)
-        config = UserConfig.from_dict(user_cfg)
+        if user_config is None:
+            user_config = {}
+        UserConfig.validate(user_config)
+        user_config_obj: UserConfig = UserConfig.from_dict(user_config)
 
         profile = cls(
             profile_name=profile_name,
             target_name=target_name,
-            config=config,
+            user_config=user_config_obj,
             threads=threads,
             credentials=credentials
         )
@@ -292,10 +294,7 @@ class Profile(HasCredentials):
             target_name = renderer.render_value(raw_profile['target'])
         else:
             target_name = 'default'
-            logger.debug(
-                "target not specified in profile '{}', using '{}'"
-                .format(profile_name, target_name)
-            )
+            fire_event(MissingProfileTarget(profile_name=profile_name, target_name=target_name))
 
         raw_profile_data = cls._get_profile_data(
             raw_profile, profile_name, target_name
@@ -313,7 +312,7 @@ class Profile(HasCredentials):
         raw_profile: Dict[str, Any],
         profile_name: str,
         renderer: ProfileRenderer,
-        user_cfg: Optional[Dict[str, Any]] = None,
+        user_config: Optional[Dict[str, Any]] = None,
         target_override: Optional[str] = None,
         threads_override: Optional[int] = None,
     ) -> 'Profile':
@@ -325,7 +324,7 @@ class Profile(HasCredentials):
             disk as yaml and its values rendered with jinja.
         :param profile_name: The profile name used.
         :param renderer: The config renderer.
-        :param user_cfg: The global config for the user, if it
+        :param user_config: The global config for the user, if it
             was present.
         :param target_override: The target to use, if provided on
             the command line.
@@ -335,9 +334,9 @@ class Profile(HasCredentials):
             target could not be found
         :returns: The new Profile object.
         """
-        # user_cfg is not rendered.
-        if user_cfg is None:
-            user_cfg = raw_profile.get('config')
+        # user_config is not rendered.
+        if user_config is None:
+            user_config = raw_profile.get('config')
         # TODO: should it be, and the values coerced to bool?
         target_name, profile_data = cls.render_profile(
             raw_profile, profile_name, target_override, renderer
@@ -358,7 +357,7 @@ class Profile(HasCredentials):
             profile_name=profile_name,
             target_name=target_name,
             threads=threads,
-            user_cfg=user_cfg
+            user_config=user_config
         )
 
     @classmethod
@@ -401,13 +400,13 @@ class Profile(HasCredentials):
                     error_string=msg
                 )
             )
-        user_cfg = raw_profiles.get('config')
+        user_config = raw_profiles.get('config')
 
         return cls.from_raw_profile_info(
             raw_profile=raw_profile,
             profile_name=profile_name,
             renderer=renderer,
-            user_cfg=user_cfg,
+            user_config=user_config,
             target_override=target_override,
             threads_override=threads_override,
         )
@@ -435,7 +434,7 @@ class Profile(HasCredentials):
         """
         threads_override = getattr(args, 'threads', None)
         target_override = getattr(args, 'target', None)
-        raw_profiles = read_profile(args.profiles_dir)
+        raw_profiles = read_profile(flags.PROFILES_DIR)
         profile_name = cls.pick_profile_name(getattr(args, 'profile', None),
                                              project_profile_name)
         return cls.from_raw_profiles(

core/dbt/config/project.py

@@ -9,6 +9,7 @@ from typing_extensions import Protocol, runtime_checkable
 import hashlib
 import os
 
+from dbt import deprecations
 from dbt.clients.system import resolve_path_from_base
 from dbt.clients.system import path_exists
 from dbt.clients.system import load_file_contents
@@ -123,13 +124,13 @@ def _parse_versions(versions: Union[List[str], str]) -> List[VersionSpecifier]:
 
 
 def _all_source_paths(
-    source_paths: List[str],
-    data_paths: List[str],
+    model_paths: List[str],
+    seed_paths: List[str],
     snapshot_paths: List[str],
     analysis_paths: List[str],
     macro_paths: List[str],
 ) -> List[str]:
-    return list(chain(source_paths, data_paths, snapshot_paths, analysis_paths,
+    return list(chain(model_paths, seed_paths, snapshot_paths, analysis_paths,
                       macro_paths))
 
 
@@ -283,6 +284,7 @@ class PartialProject(RenderComponents):
             selectors_dict=rendered_selectors,
         )
 
+    # Called by 'collect_parts' in RuntimeConfig
     def render(self, renderer: DbtProjectYamlRenderer) -> 'Project':
         try:
             rendered = self.get_rendered(renderer)
@@ -292,6 +294,21 @@ class PartialProject(RenderComponents):
                 exc.path = os.path.join(self.project_root, 'dbt_project.yml')
             raise
 
+    def check_config_path(self, project_dict, deprecated_path, exp_path):
+        if deprecated_path in project_dict:
+            if exp_path in project_dict:
+                msg = (
+                    '{deprecated_path} and {exp_path} cannot both be defined. The '
+                    '`{deprecated_path}` config has been deprecated in favor of `{exp_path}`. '
+                    'Please update your `dbt_project.yml` configuration to reflect this '
+                    'change.'
+                )
+                raise DbtProjectError(msg.format(deprecated_path=deprecated_path,
+                                                 exp_path=exp_path))
+            deprecations.warn('project_config_path',
+                              deprecated_path=deprecated_path,
+                              exp_path=exp_path)
+
     def create_project(self, rendered: RenderComponents) -> 'Project':
         unrendered = RenderComponents(
             project_dict=self.project_dict,
@@ -303,6 +320,9 @@ class PartialProject(RenderComponents):
             verify_version=self.verify_version,
         )
 
+        self.check_config_path(rendered.project_dict, 'source-paths', 'model-paths')
+        self.check_config_path(rendered.project_dict, 'data-paths', 'seed-paths')
+
         try:
             ProjectContract.validate(rendered.project_dict)
             cfg = ProjectContract.from_dict(
@@ -324,15 +344,24 @@ class PartialProject(RenderComponents):
         # to have been a cli argument.
         profile_name = cfg.profile
         # these are all the defaults
-        source_paths: List[str] = value_or(cfg.source_paths, ['models'])
+
+        # `source_paths` is deprecated but still allowed. Copy it into
+        # `model_paths` to simlify logic throughout the rest of the system.
+        model_paths: List[str] = value_or(cfg.model_paths
+                                          if 'model-paths' in rendered.project_dict
+                                          else cfg.source_paths, ['models'])
         macro_paths: List[str] = value_or(cfg.macro_paths, ['macros'])
-        data_paths: List[str] = value_or(cfg.data_paths, ['data'])
-        test_paths: List[str] = value_or(cfg.test_paths, ['test'])
-        analysis_paths: List[str] = value_or(cfg.analysis_paths, [])
+        # `data_paths` is deprecated but still allowed. Copy it into
+        # `seed_paths` to simlify logic throughout the rest of the system.
+        seed_paths: List[str] = value_or(cfg.seed_paths
+                                         if 'seed-paths' in rendered.project_dict
+                                         else cfg.data_paths, ['seeds'])
+        test_paths: List[str] = value_or(cfg.test_paths, ['tests'])
+        analysis_paths: List[str] = value_or(cfg.analysis_paths, ['analyses'])
         snapshot_paths: List[str] = value_or(cfg.snapshot_paths, ['snapshots'])
 
         all_source_paths: List[str] = _all_source_paths(
-            source_paths, data_paths, snapshot_paths, analysis_paths,
+            model_paths, seed_paths, snapshot_paths, analysis_paths,
             macro_paths
         )
 
@@ -341,7 +370,7 @@ class PartialProject(RenderComponents):
         target_path: str = value_or(cfg.target_path, 'target')
         clean_targets: List[str] = value_or(cfg.clean_targets, [target_path])
         log_path: str = value_or(cfg.log_path, 'logs')
-        modules_path: str = value_or(cfg.modules_path, 'dbt_modules')
+        packages_install_path: str = value_or(cfg.packages_install_path, 'dbt_packages')
         # in the default case we'll populate this once we know the adapter type
         # It would be nice to just pass along a Quoting here, but that would
         # break many things
@@ -369,6 +398,8 @@ class PartialProject(RenderComponents):
             vars_dict = cfg.vars
 
         vars_value = VarProvider(vars_dict)
+        # There will never be any project_env_vars when it's first created
+        project_env_vars: Dict[str, Any] = {}
         on_run_start: List[str] = value_or(cfg.on_run_start, [])
         on_run_end: List[str] = value_or(cfg.on_run_end, [])
 
@@ -382,15 +413,14 @@ class PartialProject(RenderComponents):
             # of dicts.
             manifest_selectors = SelectorDict.parse_from_selectors_list(
                 rendered.selectors_dict['selectors'])
-
         project = Project(
             project_name=name,
             version=version,
             project_root=project_root,
             profile_name=profile_name,
-            source_paths=source_paths,
+            model_paths=model_paths,
             macro_paths=macro_paths,
-            data_paths=data_paths,
+            seed_paths=seed_paths,
             test_paths=test_paths,
             analysis_paths=analysis_paths,
             docs_paths=docs_paths,
@@ -399,7 +429,7 @@ class PartialProject(RenderComponents):
             snapshot_paths=snapshot_paths,
             clean_targets=clean_targets,
             log_path=log_path,
-            modules_path=modules_path,
+            packages_install_path=packages_install_path,
             quoting=quoting,
             models=models,
             on_run_start=on_run_start,
@@ -417,6 +447,7 @@ class PartialProject(RenderComponents):
             vars=vars_value,
             config_version=cfg.config_version,
             unrendered=unrendered,
+            project_env_vars=project_env_vars,
         )
         # sanity check - this means an internal issue
         project.validate()
@@ -500,9 +531,9 @@ class Project:
     version: Union[SemverString, float]
     project_root: str
     profile_name: Optional[str]
-    source_paths: List[str]
+    model_paths: List[str]
     macro_paths: List[str]
-    data_paths: List[str]
+    seed_paths: List[str]
     test_paths: List[str]
     analysis_paths: List[str]
     docs_paths: List[str]
@@ -511,7 +542,7 @@ class Project:
     snapshot_paths: List[str]
     clean_targets: List[str]
     log_path: str
-    modules_path: str
+    packages_install_path: str
     quoting: Dict[str, Any]
     models: Dict[str, Any]
     on_run_start: List[str]
@@ -529,14 +560,22 @@ class Project:
     query_comment: QueryComment
     config_version: int
     unrendered: RenderComponents
+    project_env_vars: Dict[str, Any]
 
     @property
     def all_source_paths(self) -> List[str]:
         return _all_source_paths(
-            self.source_paths, self.data_paths, self.snapshot_paths,
+            self.model_paths, self.seed_paths, self.snapshot_paths,
             self.analysis_paths, self.macro_paths
         )
 
+    @property
+    def generic_test_paths(self):
+        generic_test_paths = []
+        for test_path in self.test_paths:
+            generic_test_paths.append(os.path.join(test_path, 'generic'))
+        return generic_test_paths
+
     def __str__(self):
         cfg = self.to_project_config(with_packages=True)
         return str(cfg)
@@ -561,9 +600,9 @@ class Project:
             'version': self.version,
             'project-root': self.project_root,
             'profile': self.profile_name,
-            'source-paths': self.source_paths,
+            'model-paths': self.model_paths,
             'macro-paths': self.macro_paths,
-            'data-paths': self.data_paths,
+            'seed-paths': self.seed_paths,
             'test-paths': self.test_paths,
             'analysis-paths': self.analysis_paths,
             'docs-paths': self.docs_paths,
@@ -611,26 +650,6 @@ class Project:
             verify_version=verify_version,
         )
 
-    @classmethod
-    def render_from_dict(
-        cls,
-        project_root: str,
-        project_dict: Dict[str, Any],
-        packages_dict: Dict[str, Any],
-        selectors_dict: Dict[str, Any],
-        renderer: DbtProjectYamlRenderer,
-        *,
-        verify_version: bool = False
-    ) -> 'Project':
-        partial = PartialProject.from_dicts(
-            project_root=project_root,
-            project_dict=project_dict,
-            packages_dict=packages_dict,
-            selectors_dict=selectors_dict,
-            verify_version=verify_version,
-        )
-        return partial.render(renderer)
-
     @classmethod
     def from_project_root(
         cls,

core/dbt/config/renderer.py

@@ -1,12 +1,13 @@
 from typing import Dict, Any, Tuple, Optional, Union, Callable
 
 from dbt.clients.jinja import get_rendered, catch_jinja
-
+from dbt.context.target import TargetContext
+from dbt.context.base import BaseContext
+from dbt.contracts.connection import HasCredentials
 from dbt.exceptions import (
     DbtProjectError, CompilationException, RecursionException
 )
-from dbt.node_types import NodeType
-from dbt.utils import deep_map
+from dbt.utils import deep_map_render
 
 
 Keypath = Tuple[Union[str, int], ...]
@@ -47,7 +48,7 @@ class BaseRenderer:
         self, data: Dict[str, Any]
     ) -> Dict[str, Any]:
         try:
-            return deep_map(self.render_entry, data)
+            return deep_map_render(self.render_entry, data)
         except RecursionException:
             raise DbtProjectError(
                 f'Cycle detected: {self.name} input has a reference to itself',
@@ -99,6 +100,23 @@ class ProjectPostprocessor(Dict[Keypath, Callable[[Any], Any]]):
 class DbtProjectYamlRenderer(BaseRenderer):
     _KEYPATH_HANDLERS = ProjectPostprocessor()
 
+    def __init__(
+        self, profile: Optional[HasCredentials] = None,
+        cli_vars: Optional[Dict[str, Any]] = None
+    ) -> None:
+        # Generate contexts here because we want to save the context
+        # object in order to retrieve the env_vars. This is almost always
+        # a TargetContext, but in the debug task we want a project
+        # even when we don't have a profile.
+        if cli_vars is None:
+            cli_vars = {}
+        if profile:
+            self.ctx_obj = TargetContext(profile, cli_vars)
+        else:
+            self.ctx_obj = BaseContext(cli_vars)  # type:ignore
+        context = self.ctx_obj.to_dict()
+        super().__init__(context)
+
     @property
     def name(self):
         'Project config'
@@ -158,74 +176,23 @@ class DbtProjectYamlRenderer(BaseRenderer):
 
 
 class ProfileRenderer(BaseRenderer):
+
+    def __init__(
+        self, cli_vars: Optional[Dict[str, Any]] = None
+    ) -> None:
+        # Generate contexts here because we want to save the context
+        # object in order to retrieve the env_vars.
+        if cli_vars is None:
+            cli_vars = {}
+        self.ctx_obj = BaseContext(cli_vars)
+        context = self.ctx_obj.to_dict()
+        super().__init__(context)
+
     @property
     def name(self):
         'Profile'
 
 
-class SchemaYamlRenderer(BaseRenderer):
-    DOCUMENTABLE_NODES = frozenset(
-        n.pluralize() for n in NodeType.documentable()
-    )
-
-    @property
-    def name(self):
-        return 'Rendering yaml'
-
-    def _is_norender_key(self, keypath: Keypath) -> bool:
-        """
-        models:
-            - name: blah
-            - description: blah
-              tests: ...
-            - columns:
-                - name:
-                - description: blah
-                  tests: ...
-
-        Return True if it's tests or description - those aren't rendered
-        """
-        if len(keypath) >= 2 and keypath[1] in ('tests', 'description'):
-            return True
-
-        if (
-            len(keypath) >= 4 and
-            keypath[1] == 'columns' and
-            keypath[3] in ('tests', 'description')
-        ):
-            return True
-
-        return False
-
-    # don't render descriptions or test keyword arguments
-    def should_render_keypath(self, keypath: Keypath) -> bool:
-        if len(keypath) < 2:
-            return True
-
-        if keypath[0] not in self.DOCUMENTABLE_NODES:
-            return True
-
-        if len(keypath) < 3:
-            return True
-
-        if keypath[0] == NodeType.Source.pluralize():
-            if keypath[2] == 'description':
-                return False
-            if keypath[2] == 'tables':
-                if self._is_norender_key(keypath[3:]):
-                    return False
-        elif keypath[0] == NodeType.Macro.pluralize():
-            if keypath[2] == 'arguments':
-                if self._is_norender_key(keypath[3:]):
-                    return False
-            elif self._is_norender_key(keypath[1:]):
-                return False
-        else:  # keypath[0] in self.DOCUMENTABLE_NODES:
-            if self._is_norender_key(keypath[1:]):
-                return False
-        return True
-
-
 class PackageRenderer(BaseRenderer):
     @property
     def name(self):

core/dbt/config/runtime.py

@@ -12,15 +12,15 @@ from .profile import Profile
 from .project import Project
 from .renderer import DbtProjectYamlRenderer, ProfileRenderer
 from .utils import parse_cli_vars
+from dbt import flags
 from dbt import tracking
 from dbt.adapters.factory import get_relation_class_by_name, get_include_paths
 from dbt.helper_types import FQNPath, PathSet
-from dbt.context.base import generate_base_context
-from dbt.context.target import generate_target_context
 from dbt.contracts.connection import AdapterRequiredConfig, Credentials
 from dbt.contracts.graph.manifest import ManifestMetadata
 from dbt.contracts.relation import ComponentName
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.types import ProfileLoadError, ProfileNotFound
+from dbt.events.functions import fire_event
 from dbt.ui import warning_tag
 
 from dbt.contracts.project import Configuration, UserConfig
@@ -59,6 +59,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
     def __post_init__(self):
         self.validate()
 
+    # Called by 'new_project' and 'from_args'
     @classmethod
     def from_parts(
         cls,
@@ -86,9 +87,9 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
             project_name=project.project_name,
             version=project.version,
             project_root=project.project_root,
-            source_paths=project.source_paths,
+            model_paths=project.model_paths,
             macro_paths=project.macro_paths,
-            data_paths=project.data_paths,
+            seed_paths=project.seed_paths,
             test_paths=project.test_paths,
             analysis_paths=project.analysis_paths,
             docs_paths=project.docs_paths,
@@ -97,7 +98,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
             snapshot_paths=project.snapshot_paths,
             clean_targets=project.clean_targets,
             log_path=project.log_path,
-            modules_path=project.modules_path,
+            packages_install_path=project.packages_install_path,
             quoting=quoting,
             models=project.models,
             on_run_start=project.on_run_start,
@@ -115,9 +116,11 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
             vars=project.vars,
             config_version=project.config_version,
             unrendered=project.unrendered,
+            project_env_vars=project.project_env_vars,
+            profile_env_vars=profile.profile_env_vars,
             profile_name=profile.profile_name,
             target_name=profile.target_name,
-            config=profile.config,
+            user_config=profile.user_config,
             threads=profile.threads,
             credentials=profile.credentials,
             args=args,
@@ -125,6 +128,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
             dependencies=dependencies,
         )
 
+    # Called by 'load_projects' in this class
     def new_project(self, project_root: str) -> 'RuntimeConfig':
         """Given a new project root, read in its project dictionary, supply the
         existing project's profile info, and create a new project file.
@@ -139,22 +143,22 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
         profile.validate()
 
         # load the new project and its packages. Don't pass cli variables.
-        renderer = DbtProjectYamlRenderer(generate_target_context(profile, {}))
+        renderer = DbtProjectYamlRenderer(profile)
 
         project = Project.from_project_root(
             project_root,
             renderer,
-            verify_version=getattr(self.args, 'version_check', False),
+            verify_version=bool(flags.VERSION_CHECK),
         )
 
-        cfg = self.from_parts(
+        runtime_config = self.from_parts(
             project=project,
             profile=profile,
             args=deepcopy(self.args),
         )
         # force our quoting back onto the new project.
-        cfg.quoting = deepcopy(self.quoting)
-        return cfg
+        runtime_config.quoting = deepcopy(self.quoting)
+        return runtime_config
 
     def serialize(self) -> Dict[str, Any]:
         """Serialize the full configuration to a single dictionary. For any
@@ -197,28 +201,33 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
     ) -> Tuple[Project, Profile]:
         # profile_name from the project
         project_root = args.project_dir if args.project_dir else os.getcwd()
-        version_check = getattr(args, 'version_check', False)
+        version_check = bool(flags.VERSION_CHECK)
         partial = Project.partial_load(
             project_root,
             verify_version=version_check
         )
 
         # build the profile using the base renderer and the one fact we know
+        # Note: only the named profile section is rendered. The rest of the
+        # profile is ignored.
         cli_vars: Dict[str, Any] = parse_cli_vars(getattr(args, 'vars', '{}'))
-        profile_renderer = ProfileRenderer(generate_base_context(cli_vars))
+        profile_renderer = ProfileRenderer(cli_vars)
         profile_name = partial.render_profile_name(profile_renderer)
-
         profile = cls._get_rendered_profile(
             args, profile_renderer, profile_name
         )
+        # Save env_vars encountered in rendering for partial parsing
+        profile.profile_env_vars = profile_renderer.ctx_obj.env_vars
 
         # get a new renderer using our target information and render the
         # project
-        ctx = generate_target_context(profile, cli_vars)
-        project_renderer = DbtProjectYamlRenderer(ctx)
+        project_renderer = DbtProjectYamlRenderer(profile, cli_vars)
         project = partial.render(project_renderer)
+        # Save env_vars encountered in rendering for partial parsing
+        project.project_env_vars = project_renderer.ctx_obj.env_vars
         return (project, profile)
 
+    # Called in main.py, lib.py, task/base.py
     @classmethod
     def from_args(cls, args: Any) -> 'RuntimeConfig':
         """Given arguments, read in dbt_project.yml from the current directory,
@@ -252,7 +261,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
     ) -> PathSet:
         for key, value in config.items():
             if isinstance(value, dict) and not key.startswith('+'):
-                self._get_v2_config_paths(value, path + (key,), paths)
+                self._get_config_paths(value, path + (key,), paths)
             else:
                 paths.add(path)
         return frozenset(paths)
@@ -337,7 +346,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
                     f'dbt found {count_packages_specified} package(s) '
                     f'specified in packages.yml, but only '
                     f'{count_packages_installed} package(s) installed '
-                    f'in {self.modules_path}. Run "dbt deps" to '
+                    f'in {self.packages_install_path}. Run "dbt deps" to '
                     f'install package dependencies.'
                 )
             project_paths = itertools.chain(
@@ -359,6 +368,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
     def clear_dependencies(self):
         self.dependencies = None
 
+    # Called by 'load_dependencies' in this class
     def load_projects(
         self, paths: Iterable[Path]
     ) -> Iterator[Tuple[str, 'RuntimeConfig']]:
@@ -375,7 +385,7 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
                 yield project.project_name, project
 
     def _get_project_directories(self) -> Iterator[Path]:
-        root = Path(self.project_root) / self.modules_path
+        root = Path(self.project_root) / self.packages_install_path
 
         if root.exists():
             for path in root.iterdir():
@@ -416,7 +426,7 @@ class UnsetConfig(UserConfig):
 class UnsetProfile(Profile):
     def __init__(self):
         self.credentials = UnsetCredentials()
-        self.config = UnsetConfig()
+        self.user_config = UnsetConfig()
         self.profile_name = ''
         self.target_name = ''
         self.threads = -1
@@ -482,9 +492,9 @@ class UnsetProfileConfig(RuntimeConfig):
             project_name=project.project_name,
             version=project.version,
             project_root=project.project_root,
-            source_paths=project.source_paths,
+            model_paths=project.model_paths,
             macro_paths=project.macro_paths,
-            data_paths=project.data_paths,
+            seed_paths=project.seed_paths,
             test_paths=project.test_paths,
             analysis_paths=project.analysis_paths,
             docs_paths=project.docs_paths,
@@ -493,7 +503,7 @@ class UnsetProfileConfig(RuntimeConfig):
             snapshot_paths=project.snapshot_paths,
             clean_targets=project.clean_targets,
             log_path=project.log_path,
-            modules_path=project.modules_path,
+            packages_install_path=project.packages_install_path,
             quoting=project.quoting,  # we never use this anyway.
             models=project.models,
             on_run_start=project.on_run_start,
@@ -511,9 +521,11 @@ class UnsetProfileConfig(RuntimeConfig):
             vars=project.vars,
             config_version=project.config_version,
             unrendered=project.unrendered,
+            project_env_vars=project.project_env_vars,
+            profile_env_vars=profile.profile_env_vars,
             profile_name='',
             target_name='',
-            config=UnsetConfig(),
+            user_config=UnsetConfig(),
             threads=getattr(args, 'threads', 1),
             credentials=UnsetCredentials(),
             args=args,
@@ -533,13 +545,8 @@ class UnsetProfileConfig(RuntimeConfig):
                 args, profile_renderer, profile_name
             )
         except (DbtProjectError, DbtProfileError) as exc:
-            logger.debug(
-                'Profile not loaded due to error: {}', exc, exc_info=True
-            )
-            logger.info(
-                'No profile "{}" found, continuing with no target',
-                profile_name
-            )
+            fire_event(ProfileLoadError(exc=exc))
+            fire_event(ProfileNotFound(profile_name=profile_name))
             # return the poisoned form
             profile = UnsetProfile()
             # disable anonymous usage statistics

core/dbt/config/utils.py

@@ -1,8 +1,9 @@
 from typing import Dict, Any
 
 from dbt.clients import yaml_helper
+from dbt.events.functions import fire_event
 from dbt.exceptions import raise_compiler_error, ValidationException
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.types import InvalidVarsYAML
 
 
 def parse_cli_vars(var_string: str) -> Dict[str, Any]:
@@ -17,7 +18,5 @@ def parse_cli_vars(var_string: str) -> Dict[str, Any]:
                 "The --vars argument must be a YAML dictionary, but was "
                 "of type '{}'".format(type_name))
     except ValidationException:
-        logger.error(
-            "The YAML provided in the --vars argument is not valid.\n"
-        )
+        fire_event(InvalidVarsYAML())
         raise

core/dbt/context/base.py

@@ -6,13 +6,14 @@ from typing import (
 
 from dbt import flags
 from dbt import tracking
-from dbt.clients.jinja import undefined_error, get_rendered
+from dbt.clients.jinja import get_rendered
 from dbt.clients.yaml_helper import (  # noqa: F401
     yaml, safe_load, SafeLoader, Loader, Dumper
 )
 from dbt.contracts.graph.compiled import CompiledResource
-from dbt.exceptions import raise_compiler_error, MacroReturn
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.exceptions import raise_compiler_error, MacroReturn, raise_parsing_error
+from dbt.events.functions import fire_event
+from dbt.events.types import MacroEventInfo, MacroEventDebug
 from dbt.version import __version__ as dbt_version
 
 # These modules are added to the context. Consider alternative
@@ -21,6 +22,38 @@ import pytz
 import datetime
 import re
 
+# Contexts in dbt Core
+# Contexts are used for Jinja rendering. They include context methods,
+# executable macros, and various settings that are available in Jinja.
+#
+# Different contexts are used in different places because we allow access
+# to different methods and data in different places. Executable SQL, for
+# example, includes the available macros and the model, while Jinja in
+# yaml files is more limited.
+#
+# The context that is passed to Jinja is always in a dictionary format,
+# not an actual class, so a 'to_dict()' is executed on a context class
+# before it is used for rendering.
+#
+# Each context has a generate_<name>_context function to create the context.
+# ProviderContext subclasses have different generate functions for
+# parsing and for execution.
+#
+# Context class hierarchy
+#
+#   BaseContext -- core/dbt/context/base.py
+#     TargetContext -- core/dbt/context/target.py
+#       ConfiguredContext -- core/dbt/context/configured.py
+#         SchemaYamlContext -- core/dbt/context/configured.py
+#           DocsRuntimeContext -- core/dbt/context/configured.py
+#         MacroResolvingContext -- core/dbt/context/configured.py
+#         ManifestContext -- core/dbt/context/manifest.py
+#           QueryHeaderContext -- core/dbt/context/manifest.py
+#           ProviderContext -- core/dbt/context/provider.py
+#             MacroContext -- core/dbt/context/provider.py
+#             ModelContext -- core/dbt/context/provider.py
+#             TestContext -- core/dbt/context/provider.py
+
 
 def get_pytz_module_context() -> Dict[str, Any]:
     context_exports = pytz.__all__  # type: ignore
@@ -160,9 +193,11 @@ class Var:
 
 
 class BaseContext(metaclass=ContextMeta):
+    # subclass is TargetContext
     def __init__(self, cli_vars):
         self._ctx = {}
         self.cli_vars = cli_vars
+        self.env_vars = {}
 
     def generate_builtins(self):
         builtins: Dict[str, Any] = {}
@@ -271,20 +306,24 @@ class BaseContext(metaclass=ContextMeta):
         return Var(self._ctx, self.cli_vars)
 
     @contextmember
-    @staticmethod
-    def env_var(var: str, default: Optional[str] = None) -> str:
+    def env_var(self, var: str, default: Optional[str] = None) -> str:
         """The env_var() function. Return the environment variable named 'var'.
         If there is no such environment variable set, return the default.
 
         If the default is None, raise an exception for an undefined variable.
         """
+        return_value = None
         if var in os.environ:
-            return os.environ[var]
+            return_value = os.environ[var]
         elif default is not None:
-            return default
+            return_value = default
+
+        if return_value is not None:
+            self.env_vars[var] = return_value
+            return return_value
         else:
             msg = f"Env var required but not provided: '{var}'"
-            undefined_error(msg)
+            raise_parsing_error(msg)
 
     if os.environ.get('DBT_MACRO_DEBUGGING'):
         @contextmember
@@ -443,9 +482,9 @@ class BaseContext(metaclass=ContextMeta):
             {% endmacro %}"
         """
         if info:
-            logger.info(msg)
+            fire_event(MacroEventInfo(msg))
         else:
-            logger.debug(msg)
+            fire_event(MacroEventDebug(msg))
         return ''
 
     @contextproperty
@@ -524,14 +563,8 @@ class BaseContext(metaclass=ContextMeta):
             -- no-op
             {% endif %}
 
-        The list of valid flags are:
-
-        - `flags.STRICT_MODE`: True if `--strict` (or `-S`) was provided on the
-            command line
-        - `flags.FULL_REFRESH`: True if `--full-refresh` was provided on the
-            command line
-        - `flags.NON_DESTRUCTIVE`: True if `--non-destructive` was provided on
-            the command line
+        This supports all flags defined in flags submodule (core/dbt/flags.py)
+        TODO: Replace with object that provides read-only access to flag values
         """
         return flags
 

core/dbt/context/configured.py

@@ -1,14 +1,18 @@
-from typing import Any, Dict
+import os
+from typing import Any, Dict, Optional
 
 from dbt.contracts.connection import AdapterRequiredConfig
+from dbt.logger import SECRET_ENV_PREFIX
 from dbt.node_types import NodeType
 from dbt.utils import MultiDict
 
-from dbt.context.base import contextproperty, Var
+from dbt.context.base import contextproperty, contextmember, Var
 from dbt.context.target import TargetContext
+from dbt.exceptions import raise_parsing_error
 
 
 class ConfiguredContext(TargetContext):
+    # subclasses are SchemaYamlContext, MacroResolvingContext, ManifestContext
     config: AdapterRequiredConfig
 
     def __init__(
@@ -63,10 +67,18 @@ class ConfiguredVar(Var):
         return self.get_missing_var(var_name)
 
 
+class SchemaYamlVars():
+    def __init__(self):
+        self.env_vars = {}
+        self.vars = {}
+
+
 class SchemaYamlContext(ConfiguredContext):
-    def __init__(self, config, project_name: str):
+    # subclass is DocsRuntimeContext
+    def __init__(self, config, project_name: str, schema_yaml_vars: Optional[SchemaYamlVars]):
         super().__init__(config)
         self._project_name = project_name
+        self.schema_yaml_vars = schema_yaml_vars
 
     @contextproperty
     def var(self) -> ConfiguredVar:
@@ -74,6 +86,22 @@ class SchemaYamlContext(ConfiguredContext):
             self._ctx, self.config, self._project_name
         )
 
+    @contextmember
+    def env_var(self, var: str, default: Optional[str] = None) -> str:
+        return_value = None
+        if var in os.environ:
+            return_value = os.environ[var]
+        elif default is not None:
+            return_value = default
+
+        if return_value is not None:
+            if not var.startswith(SECRET_ENV_PREFIX) and self.schema_yaml_vars:
+                self.schema_yaml_vars.env_vars[var] = return_value
+            return return_value
+        else:
+            msg = f"Env var required but not provided: '{var}'"
+            raise_parsing_error(msg)
+
 
 class MacroResolvingContext(ConfiguredContext):
     def __init__(self, config):
@@ -86,10 +114,10 @@ class MacroResolvingContext(ConfiguredContext):
         )
 
 
-def generate_schema_yml(
-    config: AdapterRequiredConfig, project_name: str
+def generate_schema_yml_context(
+        config: AdapterRequiredConfig, project_name: str, schema_yaml_vars: SchemaYamlVars = None
 ) -> Dict[str, Any]:
-    ctx = SchemaYamlContext(config, project_name)
+    ctx = SchemaYamlContext(config, project_name, schema_yaml_vars)
     return ctx.to_dict()
 
 

core/dbt/context/docs.py

@@ -23,7 +23,7 @@ class DocsRuntimeContext(SchemaYamlContext):
         manifest: Manifest,
         current_project: str,
     ) -> None:
-        super().__init__(config, current_project)
+        super().__init__(config, current_project, None)
         self.node = node
         self.manifest = manifest
 
@@ -75,7 +75,7 @@ class DocsRuntimeContext(SchemaYamlContext):
         return target_doc.block_contents
 
 
-def generate_runtime_docs(
+def generate_runtime_docs_context(
     config: RuntimeConfig,
     target: Any,
     manifest: Manifest,

core/dbt/context/manifest.py

@@ -17,6 +17,7 @@ class ManifestContext(ConfiguredContext):
     The given macros can override any previous context values, which will be
     available as if they were accessed relative to the package name.
     """
+    # subclasses are QueryHeaderContext and ProviderContext
     def __init__(
         self,
         config: AdapterRequiredConfig,

core/dbt/context/providers.py

@@ -6,7 +6,6 @@ from typing import (
 )
 from typing_extensions import Protocol
 
-from dbt import deprecations
 from dbt.adapters.base.column import Column
 from dbt.adapters.factory import (
     get_adapter, get_adapter_package_names, get_adapter_type_names
@@ -17,6 +16,7 @@ from dbt.config import RuntimeConfig, Project
 from .base import contextmember, contextproperty, Var
 from .configured import FQNLookup
 from .context_config import ContextConfig
+from dbt.logger import SECRET_ENV_PREFIX
 from dbt.context.macro_resolver import MacroResolver, TestMacroNamespace
 from .macros import MacroNamespaceBuilder, MacroNamespace
 from .manifest import ManifestContext
@@ -32,6 +32,7 @@ from dbt.contracts.graph.compiled import (
 from dbt.contracts.graph.parsed import (
     ParsedMacro,
     ParsedExposure,
+    ParsedMetric,
     ParsedSeedNode,
     ParsedSourceDefinition,
 )
@@ -40,6 +41,7 @@ from dbt.exceptions import (
     InternalException,
     ValidationException,
     RuntimeException,
+    macro_invalid_dispatch_arg,
     missing_config,
     raise_compiler_error,
     ref_invalid_args,
@@ -47,9 +49,9 @@ from dbt.exceptions import (
     ref_bad_context,
     source_target_not_found,
     wrapped_exports,
+    raise_parsing_error,
 )
 from dbt.config import IsFQNResource
-from dbt.logger import GLOBAL_LOGGER as logger  # noqa
 from dbt.node_types import NodeType
 
 from dbt.utils import (
@@ -120,39 +122,37 @@ class BaseDatabaseWrapper:
         self,
         macro_name: str,
         macro_namespace: Optional[str] = None,
-        packages: Optional[List[str]] = None,
+        packages: Optional[List[str]] = None,  # eventually remove since it's fully deprecated
     ) -> MacroGenerator:
         search_packages: List[Optional[str]]
 
         if '.' in macro_name:
-            suggest_package, suggest_macro_name = macro_name.split('.', 1)
+            suggest_macro_namespace, suggest_macro_name = macro_name.split('.', 1)
             msg = (
                 f'In adapter.dispatch, got a macro name of "{macro_name}", '
                 f'but "." is not a valid macro name component. Did you mean '
                 f'`adapter.dispatch("{suggest_macro_name}", '
-                f'packages=["{suggest_package}"])`?'
+                f'macro_namespace="{suggest_macro_namespace}")`?'
             )
             raise CompilationException(msg)
 
         if packages is not None:
-            deprecations.warn('dispatch-packages', macro_name=macro_name)
+            raise macro_invalid_dispatch_arg(macro_name)
 
-        namespace = packages if packages else macro_namespace
+        namespace = macro_namespace
 
         if namespace is None:
             search_packages = [None]
         elif isinstance(namespace, str):
             search_packages = self._adapter.config.get_macro_search_order(namespace)
             if not search_packages and namespace in self._adapter.config.dependencies:
-                search_packages = [namespace]
-            if not search_packages:
-                raise CompilationException(
-                    f'In adapter.dispatch, got a string packages argument '
-                    f'("{packages}"), but packages should be None or a list.'
-                )
+                search_packages = [self.config.project_name, namespace]
         else:
             # Not a string and not None so must be a list
-            search_packages = namespace
+            raise CompilationException(
+                f'In adapter.dispatch, got a list macro_namespace argument '
+                f'("{macro_namespace}"), but macro_namespace should be None or a string.'
+            )
 
         attempts = []
 
@@ -164,10 +164,10 @@ class BaseDatabaseWrapper:
                     macro = self._namespace.get_from_package(
                         package_name, search_name
                     )
-                except CompilationException as exc:
-                    raise CompilationException(
-                        f'In dispatch: {exc.msg}',
-                    ) from exc
+                except CompilationException:
+                    # Only raise CompilationException if macro is not found in
+                    # any package
+                    macro = None
 
                 if package_name is None:
                     attempts.append(search_name)
@@ -638,6 +638,7 @@ T = TypeVar('T')
 
 # Base context collection, used for parsing configs.
 class ProviderContext(ManifestContext):
+    # subclasses are MacroContext, ModelContext, TestContext
     def __init__(
         self,
         model,
@@ -1151,65 +1152,45 @@ class ProviderContext(ManifestContext):
 
     @contextmember
     def adapter_macro(self, name: str, *args, **kwargs):
-        """Find the most appropriate macro for the name, considering the
-        adapter type currently in use, and call that with the given arguments.
-
-        If the name has a `.` in it, the first section before the `.` is
-        interpreted as a package name, and the remainder as a macro name.
-
-        If no adapter is found, raise a compiler exception. If an invalid
-        package name is specified, raise a compiler exception.
-
-
-        Some examples:
-
-            {# dbt will call this macro by name, providing any arguments #}
-            {% macro create_table_as(temporary, relation, sql) -%}
-
-              {# dbt will dispatch the macro call to the relevant macro #}
-              {{ adapter_macro('create_table_as', temporary, relation, sql) }}
-            {%- endmacro %}
-
-
-            {#
-                If no macro matches the specified adapter, "default" will be
-                used
-            #}
-            {% macro default__create_table_as(temporary, relation, sql) -%}
-               ...
-            {%- endmacro %}
-
-
-
-            {# Example which defines special logic for Redshift #}
-            {% macro redshift__create_table_as(temporary, relation, sql) -%}
-               ...
-            {%- endmacro %}
-
-
-
-            {# Example which defines special logic for BigQuery #}
-            {% macro bigquery__create_table_as(temporary, relation, sql) -%}
-               ...
-            {%- endmacro %}
+        """This was deprecated in v0.18 in favor of adapter.dispatch
         """
-        deprecations.warn('adapter-macro', macro_name=name)
-        original_name = name
-        package_name = None
-        if '.' in name:
-            package_name, name = name.split('.', 1)
+        msg = (
+            'The "adapter_macro" macro has been deprecated. Instead, use '
+            'the `adapter.dispatch` method to find a macro and call the '
+            'result.  For more information, see: '
+            'https://docs.getdbt.com/reference/dbt-jinja-functions/dispatch)'
+            ' adapter_macro was called for: {macro_name}'
+            .format(macro_name=name)
+        )
+        raise CompilationException(msg)
 
-        try:
-            macro = self.db_wrapper.dispatch(
-                macro_name=name, macro_namespace=package_name
-            )
-        except CompilationException as exc:
-            raise CompilationException(
-                f'In adapter_macro: {exc.msg}\n'
-                f"    Original name: '{original_name}'",
-                node=self.model
-            ) from exc
-        return macro(*args, **kwargs)
+    @contextmember
+    def env_var(self, var: str, default: Optional[str] = None) -> str:
+        """The env_var() function. Return the environment variable named 'var'.
+        If there is no such environment variable set, return the default.
+
+        If the default is None, raise an exception for an undefined variable.
+        """
+        return_value = None
+        if var in os.environ:
+            return_value = os.environ[var]
+        elif default is not None:
+            return_value = default
+
+        if return_value is not None:
+            # Save the env_var value in the manifest and the var name in the source_file.
+            # If this is compiling, do not save because it's irrelevant to parsing.
+            if (not var.startswith(SECRET_ENV_PREFIX) and self.model and
+                    not hasattr(self.model, 'compiled')):
+                self.manifest.env_vars[var] = return_value
+                source_file = self.manifest.files[self.model.file_id]
+                # Schema files should never get here
+                if source_file.parse_file_type != 'schema':
+                    source_file.env_vars.append(var)
+            return return_value
+        else:
+            msg = f"Env var required but not provided: '{var}'"
+            raise_parsing_error(msg)
 
 
 class MacroContext(ProviderContext):
@@ -1312,7 +1293,7 @@ class ModelContext(ProviderContext):
 
 
 # This is called by '_context_for', used in 'render_with_context'
-def generate_parser_model(
+def generate_parser_model_context(
     model: ManifestNode,
     config: RuntimeConfig,
     manifest: Manifest,
@@ -1329,7 +1310,7 @@ def generate_parser_model(
     return ctx.to_dict()
 
 
-def generate_generate_component_name_macro(
+def generate_generate_name_macro_context(
     macro: ParsedMacro,
     config: RuntimeConfig,
     manifest: Manifest,
@@ -1340,7 +1321,7 @@ def generate_generate_component_name_macro(
     return ctx.to_dict()
 
 
-def generate_runtime_model(
+def generate_runtime_model_context(
     model: ManifestNode,
     config: RuntimeConfig,
     manifest: Manifest,
@@ -1351,7 +1332,7 @@ def generate_runtime_model(
     return ctx.to_dict()
 
 
-def generate_runtime_macro(
+def generate_runtime_macro_context(
     macro: ParsedMacro,
     config: RuntimeConfig,
     manifest: Manifest,
@@ -1405,6 +1386,31 @@ def generate_parse_exposure(
     }
 
 
+class MetricRefResolver(BaseResolver):
+    def __call__(self, *args) -> str:
+        if len(args) not in (1, 2):
+            ref_invalid_args(self.model, args)
+        self.model.refs.append(list(args))
+        return ''
+
+
+def generate_parse_metrics(
+    metric: ParsedMetric,
+    config: RuntimeConfig,
+    manifest: Manifest,
+    package_name: str,
+) -> Dict[str, Any]:
+    project = config.load_dependencies()[package_name]
+    return {
+        'ref': MetricRefResolver(
+            None,
+            metric,
+            project,
+            manifest,
+        ),
+    }
+
+
 # This class is currently used by the schema parser in order
 # to limit the number of macros in the context by using
 # the TestMacroNamespace
@@ -1439,8 +1445,13 @@ class TestContext(ProviderContext):
     # 'depends_on.macros' by using the TestMacroNamespace
     def _build_test_namespace(self):
         depends_on_macros = []
+        # all generic tests use a macro named 'get_where_subquery' to wrap 'model' arg
+        # see generic_test_builders.build_model_str
+        get_where_subquery = self.macro_resolver.macros_by_name.get('get_where_subquery')
+        if get_where_subquery:
+            depends_on_macros.append(get_where_subquery.unique_id)
         if self.model.depends_on and self.model.depends_on.macros:
-            depends_on_macros = self.model.depends_on.macros
+            depends_on_macros.extend(self.model.depends_on.macros)
         lookup_macros = depends_on_macros.copy()
         for macro_unique_id in lookup_macros:
             lookup_macro = self.macro_resolver.macros.get(macro_unique_id)
@@ -1453,6 +1464,28 @@ class TestContext(ProviderContext):
         )
         self.namespace = macro_namespace
 
+    @contextmember
+    def env_var(self, var: str, default: Optional[str] = None) -> str:
+        return_value = None
+        if var in os.environ:
+            return_value = os.environ[var]
+        elif default is not None:
+            return_value = default
+
+        if return_value is not None:
+            # Save the env_var value in the manifest and the var name in the source_file
+            if not var.startswith(SECRET_ENV_PREFIX) and self.model:
+                self.manifest.env_vars[var] = return_value
+                # the "model" should only be test nodes, but just in case, check
+                if self.model.resource_type == NodeType.Test and self.model.file_key_name:
+                    source_file = self.manifest.files[self.model.file_id]
+                    (yaml_key, name) = self.model.file_key_name.split('.')
+                    source_file.add_env_var(var, yaml_key, name)
+            return return_value
+        else:
+            msg = f"Env var required but not provided: '{var}'"
+            raise_parsing_error(msg)
+
 
 def generate_test_context(
     model: ManifestNode,

core/dbt/context/target.py

@@ -8,6 +8,7 @@ from dbt.context.base import (
 
 
 class TargetContext(BaseContext):
+    # subclass is ConfiguredContext
     def __init__(self, config: HasCredentials, cli_vars: Dict[str, Any]):
         super().__init__(cli_vars=cli_vars)
         self.config = config

core/dbt/contracts/connection.py

@@ -7,7 +7,8 @@ from typing import (
 )
 from dbt.exceptions import InternalException
 from dbt.utils import translate_aliases
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import NewConnectionOpening
 from typing_extensions import Protocol
 from dbt.dataclass_schema import (
     dbtClassMixin, StrEnum, ExtensibleDbtClassMixin, HyphenatedDbtClassMixin,
@@ -101,10 +102,7 @@ class LazyHandle:
         self.opener = opener
 
     def resolve(self, connection: Connection) -> Connection:
-        logger.debug(
-            'Opening a new connection, currently in state {}'
-            .format(connection.state)
-        )
+        fire_event(NewConnectionOpening(connection_state=connection.state))
         return self.opener(connection)
 
 
@@ -128,10 +126,14 @@ class Credentials(
             'type not implemented for base credentials class'
         )
 
-    @abc.abstractproperty
+    @property
     def unique_field(self) -> str:
+        """Hashed and included in anonymous telemetry to track adapter adoption.
+        Return the field from Credentials that can uniquely identify
+        one team/organization using this adapter
+        """
         raise NotImplementedError(
-            'type not implemented for base credentials class'
+            'unique_field not implemented for base credentials class'
         )
 
     def hashed_unique_field(self) -> str:
@@ -186,14 +188,11 @@ class UserConfigContract(Protocol):
     partial_parse: Optional[bool] = None
     printer_width: Optional[int] = None
 
-    def set_values(self, cookie_dir: str) -> None:
-        ...
-
 
 class HasCredentials(Protocol):
     credentials: Credentials
     profile_name: str
-    config: UserConfigContract
+    user_config: UserConfigContract
     target_name: str
     threads: int
 

core/dbt/contracts/files.py

@@ -18,7 +18,8 @@ class ParseFileType(StrEnum):
     Model = 'model'
     Snapshot = 'snapshot'
     Analysis = 'analysis'
-    Test = 'test'
+    SingularTest = 'singular_test'
+    GenericTest = 'generic_test'
     Seed = 'seed'
     Documentation = 'docs'
     Schema = 'schema'
@@ -30,7 +31,8 @@ parse_file_type_to_parser = {
     ParseFileType.Model: 'ModelParser',
     ParseFileType.Snapshot: 'SnapshotParser',
     ParseFileType.Analysis: 'AnalysisParser',
-    ParseFileType.Test: 'DataTestParser',
+    ParseFileType.SingularTest: 'SingularTestParser',
+    ParseFileType.GenericTest: 'GenericTestParser',
     ParseFileType.Seed: 'SeedParser',
     ParseFileType.Documentation: 'DocumentationParser',
     ParseFileType.Schema: 'SchemaParser',
@@ -188,6 +190,7 @@ class SourceFile(BaseSourceFile):
     nodes: List[str] = field(default_factory=list)
     docs: List[str] = field(default_factory=list)
     macros: List[str] = field(default_factory=list)
+    env_vars: List[str] = field(default_factory=list)
 
     @classmethod
     def big_seed(cls, path: FilePath) -> 'SourceFile':
@@ -220,6 +223,7 @@ class SchemaSourceFile(BaseSourceFile):
     tests: Dict[str, Any] = field(default_factory=dict)
     sources: List[str] = field(default_factory=list)
     exposures: List[str] = field(default_factory=list)
+    metrics: List[str] = field(default_factory=list)
     # node patches contain models, seeds, snapshots, analyses
     ndp: List[str] = field(default_factory=list)
     # any macro patches in this file by macro unique_id.
@@ -228,6 +232,7 @@ class SchemaSourceFile(BaseSourceFile):
     # Patches are only against external sources. Sources can be
     # created too, but those are in 'sources'
     sop: List[SourceKey] = field(default_factory=list)
+    env_vars: Dict[str, Any] = field(default_factory=dict)
     pp_dict: Optional[Dict[str, Any]] = None
     pp_test_index: Optional[Dict[str, Any]] = None
 
@@ -250,7 +255,7 @@ class SchemaSourceFile(BaseSourceFile):
     def __post_serialize__(self, dct):
         dct = super().__post_serialize__(dct)
         # Remove partial parsing specific data
-        for key in ('pp_files', 'pp_test_index', 'pp_dict'):
+        for key in ('pp_test_index', 'pp_dict'):
             if key in dct:
                 del dct[key]
         return dct
@@ -297,5 +302,21 @@ class SchemaSourceFile(BaseSourceFile):
                 test_ids.extend(self.tests[key][name])
         return test_ids
 
+    def add_env_var(self, var, yaml_key, name):
+        if yaml_key not in self.env_vars:
+            self.env_vars[yaml_key] = {}
+        if name not in self.env_vars[yaml_key]:
+            self.env_vars[yaml_key][name] = []
+        if var not in self.env_vars[yaml_key][name]:
+            self.env_vars[yaml_key][name].append(var)
+
+    def delete_from_env_vars(self, yaml_key, name):
+        # We delete all vars for this yaml_key/name because the
+        # entry has been scheduled for reparsing.
+        if yaml_key in self.env_vars and name in self.env_vars[yaml_key]:
+            del self.env_vars[yaml_key][name]
+            if not self.env_vars[yaml_key]:
+                del self.env_vars[yaml_key]
+
 
 AnySourceFile = Union[SchemaSourceFile, SourceFile]

core/dbt/contracts/graph/compiled.py

@@ -2,13 +2,15 @@ from dbt.contracts.graph.parsed import (
     HasTestMetadata,
     ParsedNode,
     ParsedAnalysisNode,
-    ParsedDataTestNode,
+    ParsedSingularTestNode,
     ParsedHookNode,
     ParsedModelNode,
     ParsedExposure,
+    ParsedMetric,
     ParsedResource,
     ParsedRPCNode,
-    ParsedSchemaTestNode,
+    ParsedSqlNode,
+    ParsedGenericTestNode,
     ParsedSeedNode,
     ParsedSnapshotNode,
     ParsedSourceDefinition,
@@ -81,11 +83,17 @@ class CompiledModelNode(CompiledNode):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Model]})
 
 
+# TODO: rm?
 @dataclass
 class CompiledRPCNode(CompiledNode):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.RPCCall]})
 
 
+@dataclass
+class CompiledSqlNode(CompiledNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.SqlOperation]})
+
+
 @dataclass
 class CompiledSeedNode(CompiledNode):
     # keep this in sync with ParsedSeedNode!
@@ -107,7 +115,7 @@ class CompiledSnapshotNode(CompiledNode):
 
 
 @dataclass
-class CompiledDataTestNode(CompiledNode):
+class CompiledSingularTestNode(CompiledNode):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Test]})
     # Was not able to make mypy happy and keep the code working. We need to
     # refactor the various configs.
@@ -115,10 +123,11 @@ class CompiledDataTestNode(CompiledNode):
 
 
 @dataclass
-class CompiledSchemaTestNode(CompiledNode, HasTestMetadata):
-    # keep this in sync with ParsedSchemaTestNode!
+class CompiledGenericTestNode(CompiledNode, HasTestMetadata):
+    # keep this in sync with ParsedGenericTestNode!
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Test]})
     column_name: Optional[str] = None
+    file_key_name: Optional[str] = None
     # Was not able to make mypy happy and keep the code working. We need to
     # refactor the various configs.
     config: TestConfig = field(default_factory=TestConfig)  # type:ignore
@@ -134,7 +143,7 @@ class CompiledSchemaTestNode(CompiledNode, HasTestMetadata):
         )
 
 
-CompiledTestNode = Union[CompiledDataTestNode, CompiledSchemaTestNode]
+CompiledTestNode = Union[CompiledSingularTestNode, CompiledGenericTestNode]
 
 
 PARSED_TYPES: Dict[Type[CompiledNode], Type[ParsedResource]] = {
@@ -142,10 +151,11 @@ PARSED_TYPES: Dict[Type[CompiledNode], Type[ParsedResource]] = {
     CompiledModelNode: ParsedModelNode,
     CompiledHookNode: ParsedHookNode,
     CompiledRPCNode: ParsedRPCNode,
+    CompiledSqlNode: ParsedSqlNode,
     CompiledSeedNode: ParsedSeedNode,
     CompiledSnapshotNode: ParsedSnapshotNode,
-    CompiledDataTestNode: ParsedDataTestNode,
-    CompiledSchemaTestNode: ParsedSchemaTestNode,
+    CompiledSingularTestNode: ParsedSingularTestNode,
+    CompiledGenericTestNode: ParsedGenericTestNode,
 }
 
 
@@ -154,10 +164,11 @@ COMPILED_TYPES: Dict[Type[ParsedResource], Type[CompiledNode]] = {
     ParsedModelNode: CompiledModelNode,
     ParsedHookNode: CompiledHookNode,
     ParsedRPCNode: CompiledRPCNode,
+    ParsedSqlNode: CompiledSqlNode,
     ParsedSeedNode: CompiledSeedNode,
     ParsedSnapshotNode: CompiledSnapshotNode,
-    ParsedDataTestNode: CompiledDataTestNode,
-    ParsedSchemaTestNode: CompiledSchemaTestNode,
+    ParsedSingularTestNode: CompiledSingularTestNode,
+    ParsedGenericTestNode: CompiledGenericTestNode,
 }
 
 
@@ -185,22 +196,24 @@ def parsed_instance_for(compiled: CompiledNode) -> ParsedResource:
 
 NonSourceCompiledNode = Union[
     CompiledAnalysisNode,
-    CompiledDataTestNode,
+    CompiledSingularTestNode,
     CompiledModelNode,
     CompiledHookNode,
     CompiledRPCNode,
-    CompiledSchemaTestNode,
+    CompiledSqlNode,
+    CompiledGenericTestNode,
     CompiledSeedNode,
     CompiledSnapshotNode,
 ]
 
 NonSourceParsedNode = Union[
     ParsedAnalysisNode,
-    ParsedDataTestNode,
+    ParsedSingularTestNode,
     ParsedHookNode,
     ParsedModelNode,
     ParsedRPCNode,
-    ParsedSchemaTestNode,
+    ParsedSqlNode,
+    ParsedGenericTestNode,
     ParsedSeedNode,
     ParsedSnapshotNode,
 ]
@@ -220,8 +233,10 @@ CompileResultNode = Union[
     ParsedSourceDefinition,
 ]
 
-# anything that participates in the graph: sources, exposures, manifest nodes
+# anything that participates in the graph: sources, exposures, metrics,
+# or manifest nodes
 GraphMemberNode = Union[
     CompileResultNode,
     ParsedExposure,
+    ParsedMetric,
 ]

core/dbt/contracts/graph/manifest.py

@@ -5,7 +5,7 @@ from mashumaro import DataClassMessagePackMixin
 from multiprocessing.synchronize import Lock
 from typing import (
     Dict, List, Optional, Union, Mapping, MutableMapping, Any, Set, Tuple,
-    TypeVar, Callable, Iterable, Generic, cast, AbstractSet, ClassVar
+    TypeVar, Callable, Generic, cast, AbstractSet, ClassVar
 )
 from typing_extensions import Protocol
 from uuid import UUID
@@ -15,8 +15,8 @@ from dbt.contracts.graph.compiled import (
 )
 from dbt.contracts.graph.parsed import (
     ParsedMacro, ParsedDocumentation,
-    ParsedSourceDefinition, ParsedExposure, HasUniqueID,
-    UnpatchedSourceDefinition, ManifestNodes
+    ParsedSourceDefinition, ParsedExposure, ParsedMetric,
+    HasUniqueID, UnpatchedSourceDefinition, ManifestNodes
 )
 from dbt.contracts.graph.unparsed import SourcePatch
 from dbt.contracts.files import SourceFile, SchemaSourceFile, FileHash, AnySourceFile
@@ -29,7 +29,8 @@ from dbt.exceptions import (
     raise_duplicate_resource_name, raise_compiler_error,
 )
 from dbt.helper_types import PathSet
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import MergedFromState
 from dbt.node_types import NodeType
 from dbt.ui import line_wrap_message
 from dbt import flags
@@ -95,24 +96,23 @@ class DocLookup(dbtClassMixin):
 
 class SourceLookup(dbtClassMixin):
     def __init__(self, manifest: 'Manifest'):
-        self.storage: Dict[Tuple[str, str], Dict[PackageName, UniqueID]] = {}
+        self.storage: Dict[str, Dict[PackageName, UniqueID]] = {}
         self.populate(manifest)
 
-    def get_unique_id(self, key, package: Optional[PackageName]):
-        return find_unique_id_for_package(self.storage, key, package)
+    def get_unique_id(self, search_name, package: Optional[PackageName]):
+        return find_unique_id_for_package(self.storage, search_name, package)
 
-    def find(self, key, package: Optional[PackageName], manifest: 'Manifest'):
-        unique_id = self.get_unique_id(key, package)
+    def find(self, search_name, package: Optional[PackageName], manifest: 'Manifest'):
+        unique_id = self.get_unique_id(search_name, package)
         if unique_id is not None:
             return self.perform_lookup(unique_id, manifest)
         return None
 
     def add_source(self, source: ParsedSourceDefinition):
-        key = (source.source_name, source.name)
-        if key not in self.storage:
-            self.storage[key] = {}
+        if source.search_name not in self.storage:
+            self.storage[source.search_name] = {}
 
-        self.storage[key][source.package_name] = source.unique_id
+        self.storage[source.search_name][source.package_name] = source.unique_id
 
     def populate(self, manifest):
         for source in manifest.sources.values():
@@ -169,6 +169,43 @@ class RefableLookup(dbtClassMixin):
         return manifest.nodes[unique_id]
 
 
+# This handles both models/seeds/snapshots and sources
+class DisabledLookup(dbtClassMixin):
+
+    def __init__(self, manifest: 'Manifest'):
+        self.storage: Dict[str, Dict[PackageName, List[Any]]] = {}
+        self.populate(manifest)
+
+    def populate(self, manifest):
+        for node in list(chain.from_iterable(manifest.disabled.values())):
+            self.add_node(node)
+
+    def add_node(self, node):
+        if node.search_name not in self.storage:
+            self.storage[node.search_name] = {}
+        if node.package_name not in self.storage[node.search_name]:
+            self.storage[node.search_name][node.package_name] = []
+        self.storage[node.search_name][node.package_name].append(node)
+
+    # This should return a list of disabled nodes. It's different from
+    # the other Lookup functions in that it returns full nodes, not just unique_ids
+    def find(self, search_name, package: Optional[PackageName]):
+        if search_name not in self.storage:
+            return None
+
+        pkg_dct: Mapping[PackageName, List[Any]] = self.storage[search_name]
+
+        if package is None:
+            if not pkg_dct:
+                return None
+            else:
+                return next(iter(pkg_dct.values()))
+        elif package in pkg_dct:
+            return pkg_dct[package]
+        else:
+            return None
+
+
 class AnalysisLookup(RefableLookup):
     _lookup_types: ClassVar[set] = set([NodeType.Analysis])
 
@@ -223,9 +260,7 @@ class ManifestMetadata(BaseArtifactMetadata):
             self.user_id = tracking.active_user.id
 
         if self.send_anonymous_usage_stats is None:
-            self.send_anonymous_usage_stats = (
-                not tracking.active_user.do_not_track
-            )
+            self.send_anonymous_usage_stats = flags.SEND_ANONYMOUS_USAGE_STATS
 
     @classmethod
     def default(cls):
@@ -257,7 +292,7 @@ def build_node_edges(nodes: List[ManifestNode]):
     return _sort_values(forward_edges), _sort_values(backward_edges)
 
 
-# Build a map of children of macros
+# Build a map of children of macros and generic tests
 def build_macro_edges(nodes: List[Any]):
     forward_edges: Dict[str, List[str]] = {
         n.unique_id: [] for n in nodes if n.unique_id.startswith('macro') or n.depends_on.macros
@@ -380,38 +415,6 @@ class Searchable(Protocol):
         raise NotImplementedError('search_name not implemented')
 
 
-N = TypeVar('N', bound=Searchable)
-
-
-@dataclass
-class NameSearcher(Generic[N]):
-    name: str
-    package: Optional[str]
-    nodetypes: List[NodeType]
-
-    def _matches(self, model: N) -> bool:
-        """Return True if the model matches the given name, package, and type.
-
-        If package is None, any package is allowed.
-        nodetypes should be a container of NodeTypes that implements the 'in'
-        operator.
-        """
-        if model.resource_type not in self.nodetypes:
-            return False
-
-        if self.name != model.search_name:
-            return False
-
-        return self.package is None or self.package == model.package_name
-
-    def search(self, haystack: Iterable[N]) -> Optional[N]:
-        """Find an entry in the given iterable by name."""
-        for model in haystack:
-            if self._matches(model):
-                return model
-        return None
-
-
 D = TypeVar('D')
 
 
@@ -544,6 +547,8 @@ class ParsingInfo:
 @dataclass
 class ManifestStateCheck(dbtClassMixin):
     vars_hash: FileHash = field(default_factory=FileHash.empty)
+    project_env_vars_hash: FileHash = field(default_factory=FileHash.empty)
+    profile_env_vars_hash: FileHash = field(default_factory=FileHash.empty)
     profile_hash: FileHash = field(default_factory=FileHash.empty)
     project_hashes: MutableMapping[str, FileHash] = field(default_factory=dict)
 
@@ -560,16 +565,16 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     macros: MutableMapping[str, ParsedMacro] = field(default_factory=dict)
     docs: MutableMapping[str, ParsedDocumentation] = field(default_factory=dict)
     exposures: MutableMapping[str, ParsedExposure] = field(default_factory=dict)
+    metrics: MutableMapping[str, ParsedMetric] = field(default_factory=dict)
     selectors: MutableMapping[str, Any] = field(default_factory=dict)
-    disabled: List[CompileResultNode] = field(default_factory=list)
     files: MutableMapping[str, AnySourceFile] = field(default_factory=dict)
     metadata: ManifestMetadata = field(default_factory=ManifestMetadata)
     flat_graph: Dict[str, Any] = field(default_factory=dict)
     state_check: ManifestStateCheck = field(default_factory=ManifestStateCheck)
-    # Moved from the ParseResult object
     source_patches: MutableMapping[SourceKey, SourcePatch] = field(default_factory=dict)
-    # following is from ParseResult
-    _disabled: MutableMapping[str, List[CompileResultNode]] = field(default_factory=dict)
+    disabled: MutableMapping[str, List[CompileResultNode]] = field(default_factory=dict)
+    env_vars: MutableMapping[str, str] = field(default_factory=dict)
+
     _doc_lookup: Optional[DocLookup] = field(
         default=None, metadata={'serialize': lambda x: None, 'deserialize': lambda x: None}
     )
@@ -579,6 +584,9 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     _ref_lookup: Optional[RefableLookup] = field(
         default=None, metadata={'serialize': lambda x: None, 'deserialize': lambda x: None}
     )
+    _disabled_lookup: Optional[DisabledLookup] = field(
+        default=None, metadata={'serialize': lambda x: None, 'deserialize': lambda x: None}
+    )
     _analysis_lookup: Optional[AnalysisLookup] = field(
         default=None, metadata={'serialize': lambda x: None, 'deserialize': lambda x: None}
     )
@@ -625,6 +633,9 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     def update_exposure(self, new_exposure: ParsedExposure):
         _update_into(self.exposures, new_exposure)
 
+    def update_metric(self, new_metric: ParsedMetric):
+        _update_into(self.metrics, new_metric)
+
     def update_node(self, new_node: ManifestNode):
         _update_into(self.nodes, new_node)
 
@@ -642,6 +653,10 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
                 k: v.to_dict(omit_none=False)
                 for k, v in self.exposures.items()
             },
+            'metrics': {
+                k: v.to_dict(omit_none=False)
+                for k, v in self.metrics.items()
+            },
             'nodes': {
                 k: v.to_dict(omit_none=False)
                 for k, v in self.nodes.items()
@@ -652,26 +667,12 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             }
         }
 
-    def find_disabled_by_name(
-        self, name: str, package: Optional[str] = None
-    ) -> Optional[ManifestNode]:
-        searcher: NameSearcher = NameSearcher(
-            name, package, NodeType.refable()
-        )
-        result = searcher.search(self.disabled)
-        return result
-
-    def find_disabled_source_by_name(
-        self, source_name: str, table_name: str, package: Optional[str] = None
-    ) -> Optional[ParsedSourceDefinition]:
-        search_name = f'{source_name}.{table_name}'
-        searcher: NameSearcher = NameSearcher(
-            search_name, package, [NodeType.Source]
-        )
-        result = searcher.search(self.disabled)
-        if result is not None:
-            assert isinstance(result, ParsedSourceDefinition)
-        return result
+    def build_disabled_by_file_id(self):
+        disabled_by_file_id = {}
+        for node_list in self.disabled.values():
+            for node in node_list:
+                disabled_by_file_id[node.file_id] = node
+        return disabled_by_file_id
 
     def _materialization_candidates_for(
         self, project_name: str,
@@ -708,7 +709,12 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
 
     def get_resource_fqns(self) -> Mapping[str, PathSet]:
         resource_fqns: Dict[str, Set[Tuple[str, ...]]] = {}
-        all_resources = chain(self.exposures.values(), self.nodes.values(), self.sources.values())
+        all_resources = chain(
+            self.exposures.values(),
+            self.nodes.values(),
+            self.sources.values(),
+            self.metrics.values()
+        )
         for resource in all_resources:
             resource_type_plural = resource.resource_type.pluralize()
             if resource_type_plural not in resource_fqns:
@@ -729,7 +735,6 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             chain(self.nodes.values(), self.sources.values())
         )
 
-    # This is used in dbt.task.rpc.sql_commands 'add_new_refs'
     def deepcopy(self):
         return Manifest(
             nodes={k: _deepcopy(v) for k, v in self.nodes.items()},
@@ -737,9 +742,10 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             macros={k: _deepcopy(v) for k, v in self.macros.items()},
             docs={k: _deepcopy(v) for k, v in self.docs.items()},
             exposures={k: _deepcopy(v) for k, v in self.exposures.items()},
+            metrics={k: _deepcopy(v) for k, v in self.metrics.items()},
             selectors={k: _deepcopy(v) for k, v in self.selectors.items()},
             metadata=self.metadata,
-            disabled=[_deepcopy(n) for n in self.disabled],
+            disabled={k: _deepcopy(v) for k, v in self.disabled.items()},
             files={k: _deepcopy(v) for k, v in self.files.items()},
             state_check=_deepcopy(self.state_check),
         )
@@ -749,6 +755,7 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             self.nodes.values(),
             self.sources.values(),
             self.exposures.values(),
+            self.metrics.values(),
         ))
         forward_edges, backward_edges = build_node_edges(edge_members)
         self.child_map = forward_edges
@@ -770,6 +777,7 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             macros=self.macros,
             docs=self.docs,
             exposures=self.exposures,
+            metrics=self.metrics,
             selectors=self.selectors,
             metadata=self.metadata,
             disabled=self.disabled,
@@ -789,6 +797,8 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             return self.sources[unique_id]
         elif unique_id in self.exposures:
             return self.exposures[unique_id]
+        elif unique_id in self.metrics:
+            return self.metrics[unique_id]
         else:
             # something terrible has happened
             raise dbt.exceptions.InternalException(
@@ -822,6 +832,15 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     def rebuild_ref_lookup(self):
         self._ref_lookup = RefableLookup(self)
 
+    @property
+    def disabled_lookup(self) -> DisabledLookup:
+        if self._disabled_lookup is None:
+            self._disabled_lookup = DisabledLookup(self)
+        return self._disabled_lookup
+
+    def rebuild_disabled_lookup(self):
+        self._disabled_lookup = DisabledLookup(self)
+
     @property
     def analysis_lookup(self) -> AnalysisLookup:
         if self._analysis_lookup is None:
@@ -839,7 +858,7 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     ) -> MaybeNonSource:
 
         node: Optional[ManifestNode] = None
-        disabled: Optional[ManifestNode] = None
+        disabled: Optional[List[ManifestNode]] = None
 
         candidates = _search_packages(
             current_project, node_package, target_model_package
@@ -852,12 +871,12 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
 
             # it's possible that the node is disabled
             if disabled is None:
-                disabled = self.find_disabled_by_name(
+                disabled = self.disabled_lookup.find(
                     target_model_name, pkg
                 )
 
-        if disabled is not None:
-            return Disabled(disabled)
+        if disabled:
+            return Disabled(disabled[0])
         return None
 
     # Called by dbt.parser.manifest._resolve_sources_for_exposure
@@ -869,24 +888,24 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
         current_project: str,
         node_package: str
     ) -> MaybeParsedSource:
-        key = (target_source_name, target_table_name)
+        search_name = f'{target_source_name}.{target_table_name}'
         candidates = _search_packages(current_project, node_package)
 
         source: Optional[ParsedSourceDefinition] = None
-        disabled: Optional[ParsedSourceDefinition] = None
+        disabled: Optional[List[ParsedSourceDefinition]] = None
 
         for pkg in candidates:
-            source = self.source_lookup.find(key, pkg, self)
+            source = self.source_lookup.find(search_name, pkg, self)
             if source is not None and source.config.enabled:
                 return source
 
             if disabled is None:
-                disabled = self.find_disabled_source_by_name(
-                    target_source_name, target_table_name, pkg
+                disabled = self.disabled_lookup.find(
+                    f'{target_source_name}.{target_table_name}', pkg
                 )
 
-        if disabled is not None:
-            return Disabled(disabled)
+        if disabled:
+            return Disabled(disabled[0])
         return None
 
     # Called by DocsRuntimeContext.doc
@@ -940,9 +959,7 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
 
         # log up to 5 items
         sample = list(islice(merged, 5))
-        logger.debug(
-            f'Merged {len(merged)} items from state (sample: {sample})'
-        )
+        fire_event(MergedFromState(nbr_merged=len(merged), sample=sample))
 
     # Methods that were formerly in ParseResult
 
@@ -1008,11 +1025,17 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
         self.exposures[exposure.unique_id] = exposure
         source_file.exposures.append(exposure.unique_id)
 
+    def add_metric(self, source_file: SchemaSourceFile, metric: ParsedMetric):
+        _check_duplicates(metric, self.metrics)
+        self.metrics[metric.unique_id] = metric
+        source_file.metrics.append(metric.unique_id)
+
     def add_disabled_nofile(self, node: CompileResultNode):
-        if node.unique_id in self._disabled:
-            self._disabled[node.unique_id].append(node)
+        # There can be multiple disabled nodes for the same unique_id
+        if node.unique_id in self.disabled:
+            self.disabled[node.unique_id].append(node)
         else:
-            self._disabled[node.unique_id] = [node]
+            self.disabled[node.unique_id] = [node]
 
     def add_disabled(self, source_file: AnySourceFile, node: CompileResultNode, test_from=None):
         self.add_disabled_nofile(node)
@@ -1043,17 +1066,20 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
             self.macros,
             self.docs,
             self.exposures,
+            self.metrics,
             self.selectors,
-            self.disabled,
             self.files,
             self.metadata,
             self.flat_graph,
             self.state_check,
             self.source_patches,
-            self._disabled,
+            self.disabled,
+            self.env_vars,
             self._doc_lookup,
             self._source_lookup,
             self._ref_lookup,
+            self._disabled_lookup,
+            self._analysis_lookup,
         )
         return self.__class__, args
 
@@ -1071,7 +1097,7 @@ AnyManifest = Union[Manifest, MacroManifest]
 
 
 @dataclass
-@schema_version('manifest', 2)
+@schema_version('manifest', 4)
 class WritableManifest(ArtifactMixin):
     nodes: Mapping[UniqueID, ManifestNode] = field(
         metadata=dict(description=(
@@ -1098,13 +1124,18 @@ class WritableManifest(ArtifactMixin):
             'The exposures defined in the dbt project and its dependencies'
         ))
     )
+    metrics: Mapping[UniqueID, ParsedMetric] = field(
+        metadata=dict(description=(
+            'The metrics defined in the dbt project and its dependencies'
+        ))
+    )
     selectors: Mapping[UniqueID, Any] = field(
         metadata=dict(description=(
             'The selectors defined in selectors.yml'
         ))
     )
-    disabled: Optional[List[CompileResultNode]] = field(metadata=dict(
-        description='A list of the disabled nodes in the target'
+    disabled: Optional[Mapping[UniqueID, List[CompileResultNode]]] = field(metadata=dict(
+        description='A mapping of the disabled nodes in the target'
     ))
     parent_map: Optional[NodeEdgeMap] = field(metadata=dict(
         description='A mapping from child nodes to their dependencies',

core/dbt/contracts/graph/parsed.py

@@ -26,11 +26,10 @@ from dbt.contracts.graph.unparsed import (
     UnparsedBaseNode, FreshnessThreshold, ExternalTable,
     HasYamlMetadata, MacroArgument, UnparsedSourceDefinition,
     UnparsedSourceTableDefinition, UnparsedColumn, TestDef,
-    ExposureOwner, ExposureType, MaturityType
+    ExposureOwner, ExposureType, MaturityType, MetricFilter
 )
 from dbt.contracts.util import Replaceable, AdditionalPropertiesMixin
 from dbt.exceptions import warn_or_error
-from dbt.logger import GLOBAL_LOGGER as logger  # noqa
 from dbt import flags
 from dbt.node_types import NodeType
 
@@ -151,18 +150,11 @@ class ParsedNodeMixins(dbtClassMixin):
         # Note: config should already be updated
         self.patch_path: Optional[str] = patch.file_id
         # update created_at so process_docs will run in partial parsing
-        self.created_at = int(time.time())
+        self.created_at = time.time()
         self.description = patch.description
         self.columns = patch.columns
         self.meta = patch.meta
         self.docs = patch.docs
-        if flags.STRICT_MODE:
-            # It seems odd that an instance can be invalid
-            # Maybe there should be validation or restrictions
-            # elsewhere?
-            assert isinstance(self, dbtClassMixin)
-            dct = self.to_dict(omit_none=False)
-            self.validate(dct)
 
     def get_materialization(self):
         return self.config.materialized
@@ -189,7 +181,7 @@ class ParsedNodeMandatory(
 class ParsedNodeDefaults(ParsedNodeMandatory):
     tags: List[str] = field(default_factory=list)
     refs: List[List[str]] = field(default_factory=list)
-    sources: List[List[Any]] = field(default_factory=list)
+    sources: List[List[str]] = field(default_factory=list)
     depends_on: DependsOn = field(default_factory=DependsOn)
     description: str = field(default='')
     columns: Dict[str, ColumnInfo] = field(default_factory=dict)
@@ -200,7 +192,7 @@ class ParsedNodeDefaults(ParsedNodeMandatory):
     build_path: Optional[str] = None
     deferred: bool = False
     unrendered_config: Dict[str, Any] = field(default_factory=dict)
-    created_at: int = field(default_factory=lambda: int(time.time()))
+    created_at: float = field(default_factory=lambda: time.time())
     config_call_dict: Dict[str, Any] = field(default_factory=dict)
 
     def write_node(self, target_path: str, subdirectory: str, payload: str):
@@ -247,11 +239,13 @@ class ParsedNode(ParsedNodeDefaults, ParsedNodeMixins, SerializableType):
             return ParsedSeedNode.from_dict(dct)
         elif resource_type == 'rpc':
             return ParsedRPCNode.from_dict(dct)
+        elif resource_type == 'sql':
+            return ParsedSqlNode.from_dict(dct)
         elif resource_type == 'test':
             if 'test_metadata' in dct:
-                return ParsedSchemaTestNode.from_dict(dct)
+                return ParsedGenericTestNode.from_dict(dct)
             else:
-                return ParsedDataTestNode.from_dict(dct)
+                return ParsedSingularTestNode.from_dict(dct)
         elif resource_type == 'operation':
             return ParsedHookNode.from_dict(dct)
         elif resource_type == 'seed':
@@ -348,11 +342,17 @@ class ParsedModelNode(ParsedNode):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Model]})
 
 
+# TODO: rm?
 @dataclass
 class ParsedRPCNode(ParsedNode):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.RPCCall]})
 
 
+@dataclass
+class ParsedSqlNode(ParsedNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.SqlOperation]})
+
+
 def same_seeds(first: ParsedNode, second: ParsedNode) -> bool:
     # for seeds, we check the hashes. If the hashes are different types,
     # no match. If the hashes are both the same 'path', log a warning and
@@ -409,6 +409,9 @@ class ParsedSeedNode(ParsedNode):
 @dataclass
 class TestMetadata(dbtClassMixin, Replaceable):
     name: str
+    # kwargs are the args that are left in the test builder after
+    # removing configs. They are set from the test builder when
+    # the test node is created.
     kwargs: Dict[str, Any] = field(default_factory=dict)
     namespace: Optional[str] = None
 
@@ -419,7 +422,7 @@ class HasTestMetadata(dbtClassMixin):
 
 
 @dataclass
-class ParsedDataTestNode(ParsedNode):
+class ParsedSingularTestNode(ParsedNode):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Test]})
     # Was not able to make mypy happy and keep the code working. We need to
     # refactor the various configs.
@@ -427,10 +430,11 @@ class ParsedDataTestNode(ParsedNode):
 
 
 @dataclass
-class ParsedSchemaTestNode(ParsedNode, HasTestMetadata):
-    # keep this in sync with CompiledSchemaTestNode!
+class ParsedGenericTestNode(ParsedNode, HasTestMetadata):
+    # keep this in sync with CompiledGenericTestNode!
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Test]})
     column_name: Optional[str] = None
+    file_key_name: Optional[str] = None
     # Was not able to make mypy happy and keep the code working. We need to
     # refactor the various configs.
     config: TestConfig = field(default_factory=TestConfig)  # type: ignore
@@ -500,20 +504,15 @@ class ParsedMacro(UnparsedBaseNode, HasUniqueID):
     docs: Docs = field(default_factory=Docs)
     patch_path: Optional[str] = None
     arguments: List[MacroArgument] = field(default_factory=list)
-    created_at: int = field(default_factory=lambda: int(time.time()))
+    created_at: float = field(default_factory=lambda: time.time())
 
     def patch(self, patch: ParsedMacroPatch):
         self.patch_path: Optional[str] = patch.file_id
         self.description = patch.description
-        self.created_at = int(time.time())
+        self.created_at = time.time()
         self.meta = patch.meta
         self.docs = patch.docs
         self.arguments = patch.arguments
-        if flags.STRICT_MODE:
-            # What does this actually validate?
-            assert isinstance(self, dbtClassMixin)
-            dct = self.to_dict(omit_none=False)
-            self.validate(dct)
 
     def same_contents(self, other: Optional['ParsedMacro']) -> bool:
         if other is None:
@@ -626,7 +625,7 @@ class ParsedSourceDefinition(
     patch_path: Optional[Path] = None
     unrendered_config: Dict[str, Any] = field(default_factory=dict)
     relation_name: Optional[str] = None
-    created_at: int = field(default_factory=lambda: int(time.time()))
+    created_at: float = field(default_factory=lambda: time.time())
 
     def same_database_representation(
         self, other: 'ParsedSourceDefinition'
@@ -737,7 +736,7 @@ class ParsedExposure(UnparsedBaseNode, HasUniqueID, HasFqn):
     depends_on: DependsOn = field(default_factory=DependsOn)
     refs: List[List[str]] = field(default_factory=list)
     sources: List[List[str]] = field(default_factory=list)
-    created_at: int = field(default_factory=lambda: int(time.time()))
+    created_at: float = field(default_factory=lambda: time.time())
 
     @property
     def depends_on_nodes(self):
@@ -783,13 +782,89 @@ class ParsedExposure(UnparsedBaseNode, HasUniqueID, HasFqn):
         )
 
 
+@dataclass
+class ParsedMetric(UnparsedBaseNode, HasUniqueID, HasFqn):
+    model: str
+    name: str
+    description: str
+    label: str
+    type: str
+    sql: Optional[str]
+    timestamp: Optional[str]
+    filters: List[MetricFilter]
+    time_grains: List[str]
+    dimensions: List[str]
+    resource_type: NodeType = NodeType.Metric
+    meta: Dict[str, Any] = field(default_factory=dict)
+    tags: List[str] = field(default_factory=list)
+    sources: List[List[str]] = field(default_factory=list)
+    depends_on: DependsOn = field(default_factory=DependsOn)
+    refs: List[List[str]] = field(default_factory=list)
+    created_at: int = field(default_factory=lambda: int(time.time()))
+
+    @property
+    def depends_on_nodes(self):
+        return self.depends_on.nodes
+
+    @property
+    def search_name(self):
+        return self.name
+
+    def same_model(self, old: 'ParsedMetric') -> bool:
+        return self.model == old.model
+
+    def same_dimensions(self, old: 'ParsedMetric') -> bool:
+        return self.dimensions == old.dimensions
+
+    def same_filters(self, old: 'ParsedMetric') -> bool:
+        return self.filters == old.filters
+
+    def same_description(self, old: 'ParsedMetric') -> bool:
+        return self.description == old.description
+
+    def same_label(self, old: 'ParsedMetric') -> bool:
+        return self.label == old.label
+
+    def same_type(self, old: 'ParsedMetric') -> bool:
+        return self.type == old.type
+
+    def same_sql(self, old: 'ParsedMetric') -> bool:
+        return self.sql == old.sql
+
+    def same_timestamp(self, old: 'ParsedMetric') -> bool:
+        return self.timestamp == old.timestamp
+
+    def same_time_grains(self, old: 'ParsedMetric') -> bool:
+        return self.time_grains == old.time_grains
+
+    def same_contents(self, old: Optional['ParsedMetric']) -> bool:
+        # existing when it didn't before is a change!
+        # metadata/tags changes are not "changes"
+        if old is None:
+            return True
+
+        return (
+            self.same_model(old) and
+            self.same_dimensions(old) and
+            self.same_filters(old) and
+            self.same_description(old) and
+            self.same_label(old) and
+            self.same_type(old) and
+            self.same_sql(old) and
+            self.same_timestamp(old) and
+            self.same_time_grains(old) and
+            True
+        )
+
+
 ManifestNodes = Union[
     ParsedAnalysisNode,
-    ParsedDataTestNode,
+    ParsedSingularTestNode,
     ParsedHookNode,
     ParsedModelNode,
     ParsedRPCNode,
-    ParsedSchemaTestNode,
+    ParsedSqlNode,
+    ParsedGenericTestNode,
     ParsedSeedNode,
     ParsedSnapshotNode,
 ]
@@ -800,5 +875,6 @@ ParsedResource = Union[
     ParsedMacro,
     ParsedNode,
     ParsedExposure,
+    ParsedMetric,
     ParsedSourceDefinition,
 ]

core/dbt/contracts/graph/unparsed.py

@@ -44,6 +44,11 @@ class UnparsedMacro(UnparsedBaseNode, HasSQL):
     resource_type: NodeType = field(metadata={'restrict': [NodeType.Macro]})
 
 
+@dataclass
+class UnparsedGenericTest(UnparsedBaseNode, HasSQL):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Macro]})
+
+
 @dataclass
 class UnparsedNode(UnparsedBaseNode, HasSQL):
     name: str
@@ -55,6 +60,7 @@ class UnparsedNode(UnparsedBaseNode, HasSQL):
         NodeType.Operation,
         NodeType.Seed,
         NodeType.RPCCall,
+        NodeType.SqlOperation,
     ]})
 
     @property
@@ -162,20 +168,25 @@ class TimePeriod(StrEnum):
 
 
 @dataclass
-class Time(dbtClassMixin, Replaceable):
-    count: int
-    period: TimePeriod
+class Time(dbtClassMixin, Mergeable):
+    count: Optional[int] = None
+    period: Optional[TimePeriod] = None
 
     def exceeded(self, actual_age: float) -> bool:
-        kwargs = {self.period.plural(): self.count}
+        if self.period is None or self.count is None:
+            return False
+        kwargs: Dict[str, int] = {self.period.plural(): self.count}
         difference = timedelta(**kwargs).total_seconds()
         return actual_age > difference
 
+    def __bool__(self):
+        return self.count is not None and self.period is not None
+
 
 @dataclass
 class FreshnessThreshold(dbtClassMixin, Mergeable):
-    warn_after: Optional[Time] = None
-    error_after: Optional[Time] = None
+    warn_after: Optional[Time] = field(default_factory=Time)
+    error_after: Optional[Time] = field(default_factory=Time)
     filter: Optional[str] = None
 
     def status(self, age: float) -> "dbt.contracts.results.FreshnessStatus":
@@ -188,7 +199,7 @@ class FreshnessThreshold(dbtClassMixin, Mergeable):
             return FreshnessStatus.Pass
 
     def __bool__(self):
-        return self.warn_after is not None or self.error_after is not None
+        return bool(self.warn_after) or bool(self.error_after)
 
 
 @dataclass
@@ -435,3 +446,27 @@ class UnparsedExposure(dbtClassMixin, Replaceable):
     tags: List[str] = field(default_factory=list)
     url: Optional[str] = None
     depends_on: List[str] = field(default_factory=list)
+
+
+@dataclass
+class MetricFilter(dbtClassMixin, Replaceable):
+    field: str
+    operator: str
+    # TODO : Can we make this Any?
+    value: str
+
+
+@dataclass
+class UnparsedMetric(dbtClassMixin, Replaceable):
+    model: str
+    name: str
+    label: str
+    type: str
+    description: str = ''
+    sql: Optional[str] = None
+    timestamp: Optional[str] = None
+    time_grains: List[str] = field(default_factory=list)
+    dimensions: List[str] = field(default_factory=list)
+    filters: List[MetricFilter] = field(default_factory=list)
+    meta: Dict[str, Any] = field(default_factory=dict)
+    tags: List[str] = field(default_factory=list)

core/dbt/contracts/project.py

@@ -1,9 +1,6 @@
 from dbt.contracts.util import Replaceable, Mergeable, list_str
-from dbt.contracts.connection import UserConfigContract, QueryComment
+from dbt.contracts.connection import QueryComment, UserConfigContract
 from dbt.helper_types import NoValue
-from dbt.logger import GLOBAL_LOGGER as logger  # noqa
-from dbt import tracking
-from dbt import ui
 from dbt.dataclass_schema import (
     dbtClassMixin, ValidationError,
     HyphenatedDbtClassMixin,
@@ -176,8 +173,10 @@ class Project(HyphenatedDbtClassMixin, Replaceable):
     config_version: int
     project_root: Optional[str] = None
     source_paths: Optional[List[str]] = None
+    model_paths: Optional[List[str]] = None
     macro_paths: Optional[List[str]] = None
     data_paths: Optional[List[str]] = None
+    seed_paths: Optional[List[str]] = None
     test_paths: Optional[List[str]] = None
     analysis_paths: Optional[List[str]] = None
     docs_paths: Optional[List[str]] = None
@@ -187,7 +186,7 @@ class Project(HyphenatedDbtClassMixin, Replaceable):
     clean_targets: Optional[List[str]] = None
     profile: Optional[str] = None
     log_path: Optional[str] = None
-    modules_path: Optional[str] = None
+    packages_install_path: Optional[str] = None
     quoting: Optional[Quoting] = None
     on_run_start: Optional[List[str]] = field(default_factory=list_str)
     on_run_end: Optional[List[str]] = field(default_factory=list_str)
@@ -230,25 +229,21 @@ class UserConfig(ExtensibleDbtClassMixin, Replaceable, UserConfigContract):
     use_colors: Optional[bool] = None
     partial_parse: Optional[bool] = None
     printer_width: Optional[int] = None
-
-    def set_values(self, cookie_dir):
-        if self.send_anonymous_usage_stats:
-            tracking.initialize_tracking(cookie_dir)
-        else:
-            tracking.do_not_track()
-
-        if self.use_colors is not None:
-            ui.use_colors(self.use_colors)
-
-        if self.printer_width:
-            ui.printer_width(self.printer_width)
+    write_json: Optional[bool] = None
+    warn_error: Optional[bool] = None
+    log_format: Optional[bool] = None
+    debug: Optional[bool] = None
+    version_check: Optional[bool] = None
+    fail_fast: Optional[bool] = None
+    use_experimental_parser: Optional[bool] = None
+    static_parser: Optional[bool] = None
 
 
 @dataclass
 class ProfileConfig(HyphenatedDbtClassMixin, Replaceable):
     profile_name: str = field(metadata={'preserve_underscore': True})
     target_name: str = field(metadata={'preserve_underscore': True})
-    config: UserConfig
+    user_config: UserConfig = field(metadata={'preserve_underscore': True})
     threads: int
     # TODO: make this a dynamic union of some kind?
     credentials: Optional[Dict[str, Any]]

core/dbt/contracts/relation.py

@@ -1,5 +1,5 @@
 from collections.abc import Mapping
-from dataclasses import dataclass, fields
+from dataclasses import dataclass
 from typing import (
     Optional, Dict,
 )
@@ -7,9 +7,8 @@ from typing_extensions import Protocol
 
 from dbt.dataclass_schema import dbtClassMixin, StrEnum
 
-from dbt import deprecations
 from dbt.contracts.util import Replaceable
-from dbt.exceptions import CompilationException
+from dbt.exceptions import raise_dataclass_not_dict, CompilationException
 from dbt.utils import deep_merge
 
 
@@ -43,13 +42,10 @@ class FakeAPIObject(dbtClassMixin, Replaceable, Mapping):
             raise KeyError(key) from None
 
     def __iter__(self):
-        deprecations.warn('not-a-dictionary', obj=self)
-        for _, name in self._get_fields():
-            yield name
+        raise_dataclass_not_dict(self)
 
     def __len__(self):
-        deprecations.warn('not-a-dictionary', obj=self)
-        return len(fields(self.__class__))
+        raise_dataclass_not_dict(self)
 
     def incorporate(self, **kwargs):
         value = self.to_dict(omit_none=True)

core/dbt/contracts/results.py

@@ -11,10 +11,11 @@ from dbt.contracts.util import (
     schema_version,
 )
 from dbt.exceptions import InternalException
+from dbt.events.functions import fire_event
+from dbt.events.types import TimingInfoCollected
 from dbt.logger import (
     TimingProcessor,
     JsonOnly,
-    GLOBAL_LOGGER as logger,
 )
 from dbt.utils import lowercase
 from dbt.dataclass_schema import dbtClassMixin, StrEnum
@@ -54,7 +55,7 @@ class collect_timing_info:
     def __exit__(self, exc_type, exc_value, traceback):
         self.timing_info.end()
         with JsonOnly(), TimingProcessor(self.timing_info):
-            logger.debug('finished collecting timing info')
+            fire_event(TimingInfoCollected())
 
 
 class NodeStatus(StrEnum):
@@ -185,7 +186,7 @@ class RunExecutionResult(
 
 
 @dataclass
-@schema_version('run-results', 2)
+@schema_version('run-results', 4)
 class RunResultsArtifact(ExecutionResult, ArtifactMixin):
     results: Sequence[RunResultOutput]
     args: Dict[str, Any] = field(default_factory=dict)
@@ -369,7 +370,7 @@ class FreshnessResult(ExecutionResult):
 
 
 @dataclass
-@schema_version('sources', 1)
+@schema_version('sources', 3)
 class FreshnessExecutionResultArtifact(
     ArtifactMixin,
     VersionedSchema,

core/dbt/contracts/rpc.py

@@ -1,819 +0,0 @@
-import enum
-import os
-import uuid
-from dataclasses import dataclass, field
-from datetime import datetime, timedelta
-from typing import Optional, Union, List, Any, Dict, Type, Sequence
-
-from dbt.dataclass_schema import dbtClassMixin, StrEnum
-
-from dbt.contracts.graph.compiled import CompileResultNode
-from dbt.contracts.graph.manifest import WritableManifest
-from dbt.contracts.results import (
-    RunResult, RunResultsArtifact, TimingInfo,
-    CatalogArtifact,
-    CatalogResults,
-    ExecutionResult,
-    FreshnessExecutionResultArtifact,
-    FreshnessResult,
-    RunOperationResult,
-    RunOperationResultsArtifact,
-    RunExecutionResult,
-)
-from dbt.contracts.util import VersionedSchema, schema_version
-from dbt.exceptions import InternalException
-from dbt.logger import LogMessage
-from dbt.utils import restrict_to
-
-
-TaskTags = Optional[Dict[str, Any]]
-TaskID = uuid.UUID
-
-# Inputs
-
-
-@dataclass
-class RPCParameters(dbtClassMixin):
-    task_tags: TaskTags
-    timeout: Optional[float]
-
-    @classmethod
-    def __pre_deserialize__(cls, data, omit_none=True):
-        data = super().__pre_deserialize__(data)
-        if 'timeout' not in data:
-            data['timeout'] = None
-        if 'task_tags' not in data:
-            data['task_tags'] = None
-        return data
-
-
-@dataclass
-class RPCExecParameters(RPCParameters):
-    name: str
-    sql: str
-    macros: Optional[str] = None
-
-
-@dataclass
-class RPCCompileParameters(RPCParameters):
-    threads: Optional[int] = None
-    models: Union[None, str, List[str]] = None
-    select: Union[None, str, List[str]] = None
-    exclude: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-    state: Optional[str] = None
-
-
-@dataclass
-class RPCListParameters(RPCParameters):
-    resource_types: Optional[List[str]] = None
-    models: Union[None, str, List[str]] = None
-    exclude: Union[None, str, List[str]] = None
-    select: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-    output: Optional[str] = 'json'
-    output_keys: Optional[List[str]] = None
-
-
-@dataclass
-class RPCRunParameters(RPCParameters):
-    threads: Optional[int] = None
-    models: Union[None, str, List[str]] = None
-    select: Union[None, str, List[str]] = None
-    exclude: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-    state: Optional[str] = None
-    defer: Optional[bool] = None
-
-
-@dataclass
-class RPCSnapshotParameters(RPCParameters):
-    threads: Optional[int] = None
-    select: Union[None, str, List[str]] = None
-    exclude: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-    state: Optional[str] = None
-
-
-@dataclass
-class RPCTestParameters(RPCCompileParameters):
-    data: bool = False
-    schema: bool = False
-    state: Optional[str] = None
-    defer: Optional[bool] = None
-
-
-@dataclass
-class RPCSeedParameters(RPCParameters):
-    threads: Optional[int] = None
-    select: Union[None, str, List[str]] = None
-    exclude: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-    show: bool = False
-    state: Optional[str] = None
-
-
-@dataclass
-class RPCDocsGenerateParameters(RPCParameters):
-    compile: bool = True
-    state: Optional[str] = None
-
-
-@dataclass
-class RPCBuildParameters(RPCParameters):
-    resource_types: Optional[List[str]] = None
-    select: Union[None, str, List[str]] = None
-    threads: Optional[int] = None
-    exclude: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-    state: Optional[str] = None
-    defer: Optional[bool] = None
-
-
-@dataclass
-class RPCCliParameters(RPCParameters):
-    cli: str
-
-
-@dataclass
-class RPCDepsParameters(RPCParameters):
-    pass
-
-
-@dataclass
-class KillParameters(RPCParameters):
-    task_id: TaskID
-
-
-@dataclass
-class PollParameters(RPCParameters):
-    request_token: TaskID
-    logs: bool = True
-    logs_start: int = 0
-
-
-@dataclass
-class PSParameters(RPCParameters):
-    active: bool = True
-    completed: bool = False
-
-
-@dataclass
-class StatusParameters(RPCParameters):
-    pass
-
-
-@dataclass
-class GCSettings(dbtClassMixin):
-    # start evicting the longest-ago-ended tasks here
-    maxsize: int
-    # start evicting all tasks before now - auto_reap_age when we have this
-    # many tasks in the table
-    reapsize: int
-    # a positive timedelta indicating how far back we should go
-    auto_reap_age: timedelta
-
-
-@dataclass
-class GCParameters(RPCParameters):
-    """The gc endpoint takes three arguments, any of which may be present:
-
-    - task_ids: An optional list of task ID UUIDs to try to GC
-    - before: If provided, should be a datetime string. All tasks that finished
-        before that datetime will be GCed
-    - settings: If provided, should be a GCSettings object in JSON form. It
-        will be applied to the task manager before GC starts. By default the
-        existing gc settings remain.
-    """
-    task_ids: Optional[List[TaskID]] = None
-    before: Optional[datetime] = None
-    settings: Optional[GCSettings] = None
-
-
-@dataclass
-class RPCRunOperationParameters(RPCParameters):
-    macro: str
-    args: Dict[str, Any] = field(default_factory=dict)
-
-
-@dataclass
-class RPCSourceFreshnessParameters(RPCParameters):
-    threads: Optional[int] = None
-    select: Union[None, str, List[str]] = None
-    exclude: Union[None, str, List[str]] = None
-    selector: Optional[str] = None
-
-
-@dataclass
-class GetManifestParameters(RPCParameters):
-    pass
-
-# Outputs
-
-
-@dataclass
-class RemoteResult(VersionedSchema):
-    logs: List[LogMessage]
-
-
-@dataclass
-@schema_version('remote-list-results', 1)
-class RemoteListResults(RemoteResult):
-    output: List[Any]
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-
-@dataclass
-@schema_version('remote-deps-result', 1)
-class RemoteDepsResult(RemoteResult):
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-
-@dataclass
-@schema_version('remote-catalog-result', 1)
-class RemoteCatalogResults(CatalogResults, RemoteResult):
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-    def write(self, path: str):
-        artifact = CatalogArtifact.from_results(
-            generated_at=self.generated_at,
-            nodes=self.nodes,
-            sources=self.sources,
-            compile_results=self._compile_results,
-            errors=self.errors,
-        )
-        artifact.write(path)
-
-
-@dataclass
-class RemoteCompileResultMixin(RemoteResult):
-    raw_sql: str
-    compiled_sql: str
-    node: CompileResultNode
-    timing: List[TimingInfo]
-
-
-@dataclass
-@schema_version('remote-compile-result', 1)
-class RemoteCompileResult(RemoteCompileResultMixin):
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-    @property
-    def error(self):
-        return None
-
-
-@dataclass
-@schema_version('remote-execution-result', 1)
-class RemoteExecutionResult(ExecutionResult, RemoteResult):
-    results: Sequence[RunResult]
-    args: Dict[str, Any] = field(default_factory=dict)
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-    def write(self, path: str):
-        writable = RunResultsArtifact.from_execution_results(
-            generated_at=self.generated_at,
-            results=self.results,
-            elapsed_time=self.elapsed_time,
-            args=self.args,
-        )
-        writable.write(path)
-
-    @classmethod
-    def from_local_result(
-        cls,
-        base: RunExecutionResult,
-        logs: List[LogMessage],
-    ) -> 'RemoteExecutionResult':
-        return cls(
-            generated_at=base.generated_at,
-            results=base.results,
-            elapsed_time=base.elapsed_time,
-            args=base.args,
-            logs=logs,
-        )
-
-
-@dataclass
-class ResultTable(dbtClassMixin):
-    column_names: List[str]
-    rows: List[Any]
-
-
-@dataclass
-@schema_version('remote-run-operation-result', 1)
-class RemoteRunOperationResult(RunOperationResult, RemoteResult):
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-    @classmethod
-    def from_local_result(
-        cls,
-        base: RunOperationResultsArtifact,
-        logs: List[LogMessage],
-    ) -> 'RemoteRunOperationResult':
-        return cls(
-            generated_at=base.metadata.generated_at,
-            results=base.results,
-            elapsed_time=base.elapsed_time,
-            success=base.success,
-            logs=logs,
-        )
-
-    def write(self, path: str):
-        writable = RunOperationResultsArtifact.from_success(
-            success=self.success,
-            generated_at=self.generated_at,
-            elapsed_time=self.elapsed_time,
-        )
-        writable.write(path)
-
-
-@dataclass
-@schema_version('remote-freshness-result', 1)
-class RemoteFreshnessResult(FreshnessResult, RemoteResult):
-
-    @classmethod
-    def from_local_result(
-        cls,
-        base: FreshnessResult,
-        logs: List[LogMessage],
-    ) -> 'RemoteFreshnessResult':
-        return cls(
-            metadata=base.metadata,
-            results=base.results,
-            elapsed_time=base.elapsed_time,
-            logs=logs,
-        )
-
-    def write(self, path: str):
-        writable = FreshnessExecutionResultArtifact.from_result(base=self)
-        writable.write(path)
-
-
-@dataclass
-@schema_version('remote-run-result', 1)
-class RemoteRunResult(RemoteCompileResultMixin):
-    table: ResultTable
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-
-RPCResult = Union[
-    RemoteCompileResult,
-    RemoteExecutionResult,
-    RemoteFreshnessResult,
-    RemoteCatalogResults,
-    RemoteDepsResult,
-    RemoteRunOperationResult,
-]
-
-
-# GC types
-
-class GCResultState(StrEnum):
-    Deleted = 'deleted'  # successful GC
-    Missing = 'missing'  # nothing to GC
-    Running = 'running'  # can't GC
-
-
-@dataclass
-@schema_version('remote-gc-result', 1)
-class GCResult(RemoteResult):
-    logs: List[LogMessage] = field(default_factory=list)
-    deleted: List[TaskID] = field(default_factory=list)
-    missing: List[TaskID] = field(default_factory=list)
-    running: List[TaskID] = field(default_factory=list)
-
-    def add_result(self, task_id: TaskID, state: GCResultState):
-        if state == GCResultState.Missing:
-            self.missing.append(task_id)
-        elif state == GCResultState.Running:
-            self.running.append(task_id)
-        elif state == GCResultState.Deleted:
-            self.deleted.append(task_id)
-        else:
-            raise InternalException(
-                f'Got invalid state in add_result: {state}'
-            )
-
-# Task management types
-
-
-class TaskHandlerState(StrEnum):
-    NotStarted = 'not started'
-    Initializing = 'initializing'
-    Running = 'running'
-    Success = 'success'
-    Error = 'error'
-    Killed = 'killed'
-    Failed = 'failed'
-
-    def __lt__(self, other) -> bool:
-        """A logical ordering for TaskHandlerState:
-
-        NotStarted < Initializing < Running < (Success, Error, Killed, Failed)
-        """
-        if not isinstance(other, TaskHandlerState):
-            raise TypeError('cannot compare to non-TaskHandlerState')
-        order = (self.NotStarted, self.Initializing, self.Running)
-        smaller = set()
-        for value in order:
-            smaller.add(value)
-            if self == value:
-                return other not in smaller
-
-        return False
-
-    def __le__(self, other) -> bool:
-        # so that ((Success <= Error) is True)
-        return ((self < other) or
-                (self == other) or
-                (self.finished and other.finished))
-
-    def __gt__(self, other) -> bool:
-        if not isinstance(other, TaskHandlerState):
-            raise TypeError('cannot compare to non-TaskHandlerState')
-        order = (self.NotStarted, self.Initializing, self.Running)
-        smaller = set()
-        for value in order:
-            smaller.add(value)
-            if self == value:
-                return other in smaller
-        return other in smaller
-
-    def __ge__(self, other) -> bool:
-        # so that ((Success <= Error) is True)
-        return ((self > other) or
-                (self == other) or
-                (self.finished and other.finished))
-
-    @property
-    def finished(self) -> bool:
-        return self in (self.Error, self.Success, self.Killed, self.Failed)
-
-
-@dataclass
-class TaskTiming(dbtClassMixin):
-    state: TaskHandlerState
-    start: Optional[datetime]
-    end: Optional[datetime]
-    elapsed: Optional[float]
-
-    # These ought to be defaults but superclass order doesn't
-    # allow that to work
-    @classmethod
-    def __pre_deserialize__(cls, data):
-        data = super().__pre_deserialize__(data)
-        for field_name in ('start', 'end', 'elapsed'):
-            if field_name not in data:
-                data[field_name] = None
-        return data
-
-
-@dataclass
-class TaskRow(TaskTiming):
-    task_id: TaskID
-    request_source: str
-    method: str
-    request_id: Union[str, int]
-    tags: TaskTags = None
-    timeout: Optional[float] = None
-
-
-@dataclass
-@schema_version('remote-ps-result', 1)
-class PSResult(RemoteResult):
-    rows: List[TaskRow]
-
-
-class KillResultStatus(StrEnum):
-    Missing = 'missing'
-    NotStarted = 'not_started'
-    Killed = 'killed'
-    Finished = 'finished'
-
-
-@dataclass
-@schema_version('remote-kill-result', 1)
-class KillResult(RemoteResult):
-    state: KillResultStatus = KillResultStatus.Missing
-    logs: List[LogMessage] = field(default_factory=list)
-
-
-@dataclass
-@schema_version('remote-manifest-result', 1)
-class GetManifestResult(RemoteResult):
-    manifest: Optional[WritableManifest] = None
-
-
-# this is kind of carefuly structured: BlocksManifestTasks is implied by
-# RequiresConfigReloadBefore and RequiresManifestReloadAfter
-class RemoteMethodFlags(enum.Flag):
-    Empty = 0
-    BlocksManifestTasks = 1
-    RequiresConfigReloadBefore = 3
-    RequiresManifestReloadAfter = 5
-    Builtin = 8
-
-
-# Polling types
-
-
-@dataclass
-class PollResult(RemoteResult, TaskTiming):
-    state: TaskHandlerState
-    tags: TaskTags
-    start: Optional[datetime]
-    end: Optional[datetime]
-    elapsed: Optional[float]
-
-    # These ought to be defaults but superclass order doesn't
-    # allow that to work
-    @classmethod
-    def __pre_deserialize__(cls, data):
-        data = super().__pre_deserialize__(data)
-        for field_name in ('start', 'end', 'elapsed'):
-            if field_name not in data:
-                data[field_name] = None
-        return data
-
-
-@dataclass
-@schema_version('poll-remote-deps-result', 1)
-class PollRemoteEmptyCompleteResult(PollResult, RemoteResult):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-    generated_at: datetime = field(default_factory=datetime.utcnow)
-
-    @classmethod
-    def from_result(
-        cls: Type['PollRemoteEmptyCompleteResult'],
-        base: RemoteDepsResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollRemoteEmptyCompleteResult':
-        return cls(
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-            generated_at=base.generated_at
-        )
-
-
-@dataclass
-@schema_version('poll-remote-killed-result', 1)
-class PollKilledResult(PollResult):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Killed),
-    )
-
-
-@dataclass
-@schema_version('poll-remote-execution-result', 1)
-class PollExecuteCompleteResult(
-    RemoteExecutionResult,
-    PollResult,
-):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollExecuteCompleteResult'],
-        base: RemoteExecutionResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollExecuteCompleteResult':
-        return cls(
-            results=base.results,
-            elapsed_time=base.elapsed_time,
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-            generated_at=base.generated_at,
-        )
-
-
-@dataclass
-@schema_version('poll-remote-compile-result', 1)
-class PollCompileCompleteResult(
-    RemoteCompileResult,
-    PollResult,
-):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollCompileCompleteResult'],
-        base: RemoteCompileResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollCompileCompleteResult':
-        return cls(
-            raw_sql=base.raw_sql,
-            compiled_sql=base.compiled_sql,
-            node=base.node,
-            timing=base.timing,
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-            generated_at=base.generated_at
-        )
-
-
-@dataclass
-@schema_version('poll-remote-run-result', 1)
-class PollRunCompleteResult(
-    RemoteRunResult,
-    PollResult,
-):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollRunCompleteResult'],
-        base: RemoteRunResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollRunCompleteResult':
-        return cls(
-            raw_sql=base.raw_sql,
-            compiled_sql=base.compiled_sql,
-            node=base.node,
-            timing=base.timing,
-            logs=logs,
-            table=base.table,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-            generated_at=base.generated_at
-        )
-
-
-@dataclass
-@schema_version('poll-remote-run-operation-result', 1)
-class PollRunOperationCompleteResult(
-    RemoteRunOperationResult,
-    PollResult,
-):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollRunOperationCompleteResult'],
-        base: RemoteRunOperationResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollRunOperationCompleteResult':
-        return cls(
-            success=base.success,
-            results=base.results,
-            generated_at=base.generated_at,
-            elapsed_time=base.elapsed_time,
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-        )
-
-
-@dataclass
-@schema_version('poll-remote-catalog-result', 1)
-class PollCatalogCompleteResult(RemoteCatalogResults, PollResult):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollCatalogCompleteResult'],
-        base: RemoteCatalogResults,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollCatalogCompleteResult':
-        return cls(
-            nodes=base.nodes,
-            sources=base.sources,
-            generated_at=base.generated_at,
-            errors=base.errors,
-            _compile_results=base._compile_results,
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-        )
-
-
-@dataclass
-@schema_version('poll-remote-in-progress-result', 1)
-class PollInProgressResult(PollResult):
-    pass
-
-
-@dataclass
-@schema_version('poll-remote-get-manifest-result', 1)
-class PollGetManifestResult(GetManifestResult, PollResult):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollGetManifestResult'],
-        base: GetManifestResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollGetManifestResult':
-        return cls(
-            manifest=base.manifest,
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-        )
-
-
-@dataclass
-@schema_version('poll-remote-freshness-result', 1)
-class PollFreshnessResult(RemoteFreshnessResult, PollResult):
-    state: TaskHandlerState = field(
-        metadata=restrict_to(TaskHandlerState.Success,
-                             TaskHandlerState.Failed),
-    )
-
-    @classmethod
-    def from_result(
-        cls: Type['PollFreshnessResult'],
-        base: RemoteFreshnessResult,
-        tags: TaskTags,
-        timing: TaskTiming,
-        logs: List[LogMessage],
-    ) -> 'PollFreshnessResult':
-        return cls(
-            logs=logs,
-            tags=tags,
-            state=timing.state,
-            start=timing.start,
-            end=timing.end,
-            elapsed=timing.elapsed,
-            metadata=base.metadata,
-            results=base.results,
-            elapsed_time=base.elapsed_time,
-        )
-
-# Manifest parsing types
-
-
-class ManifestStatus(StrEnum):
-    Init = 'init'
-    Compiling = 'compiling'
-    Ready = 'ready'
-    Error = 'error'
-
-
-@dataclass
-@schema_version('remote-status-result', 1)
-class LastParse(RemoteResult):
-    state: ManifestStatus = ManifestStatus.Init
-    logs: List[LogMessage] = field(default_factory=list)
-    error: Optional[Dict[str, Any]] = None
-    timestamp: datetime = field(default_factory=datetime.utcnow)
-    pid: int = field(default_factory=os.getpid)

core/dbt/contracts/sql.py

@@ -0,0 +1,88 @@
+import uuid
+from dataclasses import dataclass, field
+from datetime import datetime
+from typing import Optional, List, Any, Dict, Sequence
+
+from dbt.dataclass_schema import dbtClassMixin
+
+from dbt.contracts.graph.compiled import CompileResultNode
+from dbt.contracts.results import (
+    RunResult, RunResultsArtifact, TimingInfo,
+    ExecutionResult,
+    RunExecutionResult,
+)
+from dbt.contracts.util import VersionedSchema, schema_version
+from dbt.logger import LogMessage
+
+
+TaskTags = Optional[Dict[str, Any]]
+TaskID = uuid.UUID
+
+# Outputs
+
+
+@dataclass
+class RemoteResult(VersionedSchema):
+    logs: List[LogMessage]
+
+
+@dataclass
+class RemoteCompileResultMixin(RemoteResult):
+    raw_sql: str
+    compiled_sql: str
+    node: CompileResultNode
+    timing: List[TimingInfo]
+
+
+@dataclass
+@schema_version('remote-compile-result', 1)
+class RemoteCompileResult(RemoteCompileResultMixin):
+    generated_at: datetime = field(default_factory=datetime.utcnow)
+
+    @property
+    def error(self):
+        return None
+
+
+@dataclass
+@schema_version('remote-execution-result', 1)
+class RemoteExecutionResult(ExecutionResult, RemoteResult):
+    results: Sequence[RunResult]
+    args: Dict[str, Any] = field(default_factory=dict)
+    generated_at: datetime = field(default_factory=datetime.utcnow)
+
+    def write(self, path: str):
+        writable = RunResultsArtifact.from_execution_results(
+            generated_at=self.generated_at,
+            results=self.results,
+            elapsed_time=self.elapsed_time,
+            args=self.args,
+        )
+        writable.write(path)
+
+    @classmethod
+    def from_local_result(
+        cls,
+        base: RunExecutionResult,
+        logs: List[LogMessage],
+    ) -> 'RemoteExecutionResult':
+        return cls(
+            generated_at=base.generated_at,
+            results=base.results,
+            elapsed_time=base.elapsed_time,
+            args=base.args,
+            logs=logs,
+        )
+
+
+@dataclass
+class ResultTable(dbtClassMixin):
+    column_names: List[str]
+    rows: List[Any]
+
+
+@dataclass
+@schema_version('remote-run-result', 1)
+class RemoteRunResult(RemoteCompileResultMixin):
+    table: ResultTable
+    generated_at: datetime = field(default_factory=datetime.utcnow)

core/dbt/contracts/state.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 from .graph.manifest import WritableManifest
+from .results import RunResultsArtifact
 from typing import Optional
 from dbt.exceptions import IncompatibleSchemaException
 
@@ -8,6 +9,7 @@ class PreviousState:
     def __init__(self, path: Path):
         self.path: Path = path
         self.manifest: Optional[WritableManifest] = None
+        self.results: Optional[RunResultsArtifact] = None
 
         manifest_path = self.path / 'manifest.json'
         if manifest_path.exists() and manifest_path.is_file():
@@ -16,3 +18,11 @@ class PreviousState:
             except IncompatibleSchemaException as exc:
                 exc.add_filename(str(manifest_path))
                 raise
+
+        results_path = self.path / 'run_results.json'
+        if results_path.exists() and results_path.is_file():
+            try:
+                self.results = RunResultsArtifact.read(str(results_path))
+            except IncompatibleSchemaException as exc:
+                exc.add_filename(str(results_path))
+                raise

core/dbt/contracts/util.py

@@ -170,6 +170,12 @@ class BaseArtifactMetadata(dbtClassMixin):
     )
     env: Dict[str, str] = dataclasses.field(default_factory=get_metadata_env)
 
+    def __post_serialize__(self, dct):
+        dct = super().__post_serialize__(dct)
+        if dct['generated_at'] and dct['generated_at'].endswith('+00:00'):
+            dct['generated_at'] = dct['generated_at'].replace('+00:00', '') + "Z"
+        return dct
+
 
 def schema_version(name: str, version: int):
     def inner(cls: Type[VersionedSchema]):

core/dbt/deprecations.py

@@ -43,94 +43,6 @@ class DBTDeprecation:
             active_deprecations.add(self.name)
 
 
-class DispatchPackagesDeprecation(DBTDeprecation):
-    _name = 'dispatch-packages'
-    _description = '''\
-    The "packages" argument of adapter.dispatch() has been deprecated.
-    Use the "macro_namespace" argument instead.
-
-    Raised during dispatch for: {macro_name}
-
-    For more information, see:
-
-    https://docs.getdbt.com/reference/dbt-jinja-functions/dispatch
-    '''
-
-
-class MaterializationReturnDeprecation(DBTDeprecation):
-    _name = 'materialization-return'
-
-    _description = '''\
-    The materialization ("{materialization}") did not explicitly return a list
-    of relations to add to the cache. By default the target relation will be
-    added, but this behavior will be removed in a future version of dbt.
-
-
-
-    For more information, see:
-
-    https://docs.getdbt.com/v0.15/docs/creating-new-materializations#section-6-returning-relations
-    '''
-
-
-class NotADictionaryDeprecation(DBTDeprecation):
-    _name = 'not-a-dictionary'
-
-    _description = '''\
-    The object ("{obj}") was used as a dictionary. In a future version of dbt
-    this capability will be removed from objects of this type.
-    '''
-
-
-class ColumnQuotingDeprecation(DBTDeprecation):
-    _name = 'column-quoting-unset'
-
-    _description = '''\
-    The quote_columns parameter was not set for seeds, so the default value of
-    False was chosen. The default will change to True in a future release.
-
-
-
-    For more information, see:
-
-    https://docs.getdbt.com/v0.15/docs/seeds#section-specify-column-quoting
-    '''
-
-
-class ModelsKeyNonModelDeprecation(DBTDeprecation):
-    _name = 'models-key-mismatch'
-
-    _description = '''\
-    "{node.name}" is a {node.resource_type} node, but it is specified in
-    the {patch.yaml_key} section of {patch.original_file_path}.
-
-
-
-    To fix this warning, place the `{node.name}` specification under
-    the {expected_key} key instead.
-
-    This warning will become an error in a future release.
-    '''
-
-
-class ExecuteMacrosReleaseDeprecation(DBTDeprecation):
-    _name = 'execute-macro-release'
-    _description = '''\
-    The "release" argument to execute_macro is now ignored, and will be removed
-    in a future relase of dbt. At that time, providing a `release` argument
-    will result in an error.
-    '''
-
-
-class AdapterMacroDeprecation(DBTDeprecation):
-    _name = 'adapter-macro'
-    _description = '''\
-    The "adapter_macro" macro has been deprecated. Instead, use the
-    `adapter.dispatch` method to find a macro and call the result.
-    adapter_macro was called for: {macro_name}
-    '''
-
-
 class PackageRedirectDeprecation(DBTDeprecation):
     _name = 'package-redirect'
     _description = '''\
@@ -139,6 +51,23 @@ class PackageRedirectDeprecation(DBTDeprecation):
     '''
 
 
+class PackageInstallPathDeprecation(DBTDeprecation):
+    _name = 'install-packages-path'
+    _description = '''\
+    The default package install path has changed from `dbt_modules` to `dbt_packages`.
+    Please update `clean-targets` in `dbt_project.yml` and check `.gitignore` as well.
+    Or, set `packages-install-path: dbt_modules` if you'd like to keep the current value.
+    '''
+
+
+class ConfigPathDeprecation(DBTDeprecation):
+    _name = 'project_config_path'
+    _description = '''\
+    The `{deprecated_path}` config has been deprecated in favor of `{exp_path}`.
+    Please update your `dbt_project.yml` configuration to reflect this change.
+    '''
+
+
 _adapter_renamed_description = """\
 The adapter function `adapter.{old_name}` is deprecated and will be removed in
 a future release of dbt. Please use `adapter.{new_name}` instead.
@@ -177,13 +106,8 @@ def warn(name, *args, **kwargs):
 active_deprecations: Set[str] = set()
 
 deprecations_list: List[DBTDeprecation] = [
-    DispatchPackagesDeprecation(),
-    MaterializationReturnDeprecation(),
-    NotADictionaryDeprecation(),
-    ColumnQuotingDeprecation(),
-    ModelsKeyNonModelDeprecation(),
-    ExecuteMacrosReleaseDeprecation(),
-    AdapterMacroDeprecation(),
+    ConfigPathDeprecation(),
+    PackageInstallPathDeprecation(),
     PackageRedirectDeprecation()
 ]
 

core/dbt/deps/base.py

@@ -6,7 +6,8 @@ from typing import List, Optional, Generic, TypeVar
 
 from dbt.clients import system
 from dbt.contracts.project import ProjectPackageMetadata
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import DepsSetDownloadDirectory
 
 DOWNLOADS_PATH = None
 
@@ -31,7 +32,7 @@ def downloads_directory():
         remove_downloads = True
 
     system.make_directory(DOWNLOADS_PATH)
-    logger.debug("Set downloads directory='{}'".format(DOWNLOADS_PATH))
+    fire_event(DepsSetDownloadDirectory(path=DOWNLOADS_PATH))
 
     yield DOWNLOADS_PATH
 
@@ -91,7 +92,7 @@ class PinnedPackage(BasePackage):
 
     def get_installation_path(self, project, renderer):
         dest_dirname = self.get_project_name(project, renderer)
-        return os.path.join(project.modules_path, dest_dirname)
+        return os.path.join(project.packages_install_path, dest_dirname)
 
     def get_subdirectory(self):
         return None

core/dbt/deps/git.py

@@ -12,7 +12,8 @@ from dbt.deps.base import PinnedPackage, UnpinnedPackage, get_downloads_path
 from dbt.exceptions import (
     ExecutableError, warn_or_error, raise_dependency_error
 )
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import EnsureGitInstalled
 from dbt import ui
 
 PIN_PACKAGE_URL = 'https://docs.getdbt.com/docs/package-management#section-specifying-package-versions' # noqa
@@ -81,11 +82,7 @@ class GitPinnedPackage(GitPackageMixin, PinnedPackage):
             )
         except ExecutableError as exc:
             if exc.cmd and exc.cmd[0] == 'git':
-                logger.error(
-                    'Make sure git is installed on your machine. More '
-                    'information: '
-                    'https://docs.getdbt.com/docs/package-management'
-                )
+                fire_event(EnsureGitInstalled())
             raise
         return os.path.join(get_downloads_path(), dir_)
 

core/dbt/deps/local.py

@@ -6,7 +6,8 @@ from dbt.contracts.project import (
     ProjectPackageMetadata,
     LocalPackage,
 )
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import DepsCreatingLocalSymlink, DepsSymlinkNotAvailable
 
 
 class LocalPackageMixin:
@@ -57,12 +58,11 @@ class LocalPinnedPackage(LocalPackageMixin, PinnedPackage):
                 system.remove_file(dest_path)
 
         if can_create_symlink:
-            logger.debug('  Creating symlink to local dependency.')
+            fire_event(DepsCreatingLocalSymlink())
             system.make_symlink(src_path, dest_path)
 
         else:
-            logger.debug('  Symlinks are not available on this '
-                         'OS, copying dependency.')
+            fire_event(DepsSymlinkNotAvailable())
             shutil.copytree(src_path, dest_path)
 
 

core/dbt/deps/registry.py

@@ -69,7 +69,7 @@ class RegistryPinnedPackage(RegistryPackageMixin, PinnedPackage):
 
         download_url = metadata.downloads.tarball
         system.download_with_retries(download_url, tar_path)
-        deps_path = project.modules_path
+        deps_path = project.packages_install_path
         package_name = self.get_project_name(project, renderer)
         system.untar_package(tar_path, deps_path, package_name)
 

core/dbt/deps/resolver.py

@@ -3,7 +3,6 @@ from typing import Dict, List, NoReturn, Union, Type, Iterator, Set
 
 from dbt.exceptions import raise_dependency_error, InternalException
 
-from dbt.context.target import generate_target_context
 from dbt.config import Project, RuntimeConfig
 from dbt.config.renderer import DbtProjectYamlRenderer
 from dbt.deps.base import BasePackage, PinnedPackage, UnpinnedPackage
@@ -126,8 +125,7 @@ def resolve_packages(
     pending = PackageListing.from_contracts(packages)
     final = PackageListing()
 
-    ctx = generate_target_context(config, config.cli_vars)
-    renderer = DbtProjectYamlRenderer(ctx)
+    renderer = DbtProjectYamlRenderer(config, config.cli_vars)
 
     while pending:
         next_pending = PackageListing()

core/dbt/events/README.md

@@ -0,0 +1,22 @@
+# Events Module
+
+The Events module is the implmentation for structured logging. These events represent both a programatic interface to dbt processes as well as human-readable messaging in one centralized place. The centralization allows for leveraging mypy to enforce interface invariants across all dbt events, and the distinct type layer allows for decoupling events and libraries such as loggers.
+
+# Using the Events Module
+The event module provides types that represent what is happening in dbt in `events.types`. These types are intended to represent an exhaustive list of all things happening within dbt that will need to be logged, streamed, or printed. To fire an event, `events.functions::fire_event` is the entry point to the module from everywhere in dbt.
+
+# Adding a New Event
+In `events.types` add a new class that represents the new event. This may be a simple class with no values, or it may be a dataclass with some values to construct downstream messaging. Only include the data necessary to construct this message within this class. You must extend all destinations (e.g. - if your log message belongs on the cli, extend `CliEventABC`) as well as the loglevel this event belongs to.
+
+# Adapter Maintainers
+To integrate existing log messages from adapters, you likely have a line of code like this in your adapter already:
+```python
+from dbt.logger import GLOBAL_LOGGER as logger
+```
+
+Simply change it to these two lines with your adapter's database name, and all your existing call sites will now use the new system for v1.0:
+```python
+from dbt.events import AdapterLogger
+logger = AdapterLogger("<database name>")
+# e.g. AdapterLogger("Snowflake")
+```

core/dbt/events/__init__.py

@@ -0,0 +1 @@
+from .adapter_endpoint import AdapterLogger  # noqa: F401

core/dbt/events/adapter_endpoint.py

@@ -0,0 +1,86 @@
+from dataclasses import dataclass
+from dbt.events.functions import fire_event
+from dbt.events.types import (
+    AdapterEventDebug, AdapterEventInfo, AdapterEventWarning, AdapterEventError
+)
+from typing import Any
+
+
+@dataclass
+class AdapterLogger():
+    name: str
+
+    def debug(
+        self,
+        msg: str,
+        exc_info: Any = None,
+        stack_info: Any = None,
+        extra: Any = None
+    ):
+        event = AdapterEventDebug(name=self.name, raw_msg=msg)
+
+        event.exc_info = exc_info
+        event.stack_info = stack_info
+        event.extra = extra
+
+        fire_event(event)
+
+    def info(
+        self,
+        msg: str,
+        exc_info: Any = None,
+        stack_info: Any = None,
+        extra: Any = None
+    ):
+        event = AdapterEventInfo(name=self.name, raw_msg=msg)
+
+        event.exc_info = exc_info
+        event.stack_info = stack_info
+        event.extra = extra
+
+        fire_event(event)
+
+    def warning(
+        self,
+        msg: str,
+        exc_info: Any = None,
+        stack_info: Any = None,
+        extra: Any = None
+    ):
+        event = AdapterEventWarning(name=self.name, raw_msg=msg)
+
+        event.exc_info = exc_info
+        event.stack_info = stack_info
+        event.extra = extra
+
+        fire_event(event)
+
+    def error(
+        self,
+        msg: str,
+        exc_info: Any = None,
+        stack_info: Any = None,
+        extra: Any = None
+    ):
+        event = AdapterEventError(name=self.name, raw_msg=msg)
+
+        event.exc_info = exc_info
+        event.stack_info = stack_info
+        event.extra = extra
+
+        fire_event(event)
+
+    def exception(
+        self,
+        msg: str,
+        exc_info: Any = True,  # this default is what makes this method different
+        stack_info: Any = None,
+        extra: Any = None
+    ):
+        event = AdapterEventError(name=self.name, raw_msg=msg)
+
+        event.exc_info = exc_info
+        event.stack_info = stack_info
+        event.extra = extra
+
+        fire_event(event)

core/dbt/events/format.py

@@ -0,0 +1,49 @@
+from dbt import ui
+from typing import Optional, Union
+from dbt.node_types import NodeType
+
+
+def format_fancy_output_line(
+        msg: str, status: str, index: Optional[int],
+        total: Optional[int], execution_time: Optional[float] = None,
+        truncate: bool = False
+) -> str:
+    if index is None or total is None:
+        progress = ''
+    else:
+        progress = '{} of {} '.format(index, total)
+    prefix = "{progress}{message}".format(
+        progress=progress,
+        message=msg)
+
+    truncate_width = ui.printer_width() - 3
+    justified = prefix.ljust(ui.printer_width(), ".")
+    if truncate and len(justified) > truncate_width:
+        justified = justified[:truncate_width] + '...'
+
+    if execution_time is None:
+        status_time = ""
+    else:
+        status_time = " in {execution_time:0.2f}s".format(
+            execution_time=execution_time)
+
+    output = "{justified} [{status}{status_time}]".format(
+        justified=justified, status=status, status_time=status_time)
+
+    return output
+
+
+def _pluralize(string: Union[str, NodeType]) -> str:
+    try:
+        convert = NodeType(string)
+    except ValueError:
+        return f'{string}s'
+    else:
+        return convert.pluralize()
+
+
+def pluralize(count, string: Union[str, NodeType]):
+    pluralized: str = str(string)
+    if count != 1:
+        pluralized = _pluralize(string)
+    return f'{count} {pluralized}'

core/dbt/events/functions.py

@@ -0,0 +1,248 @@
+
+from colorama import Style
+import dbt.events.functions as this  # don't worry I hate it too.
+from dbt.events.types import Cli, Event, File, ShowException
+import dbt.flags as flags
+# TODO this will need to move eventually
+from dbt.logger import SECRET_ENV_PREFIX, make_log_dir_if_missing, GLOBAL_LOGGER
+import io
+from io import StringIO
+import json
+import logging
+from logging import Logger
+from logging.handlers import RotatingFileHandler
+import os
+from typing import List
+
+
+# create the global file logger with no configuration
+global FILE_LOG
+FILE_LOG = logging.getLogger('default_file')
+
+# set up logger to go to stdout with defaults
+# setup_event_logger will be called once args have been parsed
+global STDOUT_LOG
+STDOUT_LOG = logging.getLogger('default_stdout')
+STDOUT_LOG.setLevel(logging.INFO)
+stdout_handler = logging.StreamHandler()
+stdout_handler.setLevel(logging.INFO)
+STDOUT_LOG.addHandler(stdout_handler)
+
+format_color = True
+format_json = False
+
+
+def setup_event_logger(log_path):
+    make_log_dir_if_missing(log_path)
+    this.format_json = flags.LOG_FORMAT == 'json'
+    # USE_COLORS can be None if the app just started and the cli flags
+    # havent been applied yet
+    this.format_color = True if flags.USE_COLORS else False
+    # TODO this default should live somewhere better
+    log_dest = os.path.join(log_path, 'dbt.log')
+    level = logging.DEBUG if flags.DEBUG else logging.INFO
+
+    # overwrite the STDOUT_LOG logger with the configured one
+    this.STDOUT_LOG = logging.getLogger('configured_std_out')
+    this.STDOUT_LOG.setLevel(level)
+
+    FORMAT = "%(message)s"
+    stdout_passthrough_formatter = logging.Formatter(fmt=FORMAT)
+
+    stdout_handler = logging.StreamHandler()
+    stdout_handler.setFormatter(stdout_passthrough_formatter)
+    stdout_handler.setLevel(level)
+    this.STDOUT_LOG.addHandler(stdout_handler)
+
+    # overwrite the FILE_LOG logger with the configured one
+    this.FILE_LOG = logging.getLogger('configured_file')
+    this.FILE_LOG.setLevel(logging.DEBUG)  # always debug regardless of user input
+
+    file_passthrough_formatter = logging.Formatter(fmt=FORMAT)
+
+    file_handler = RotatingFileHandler(filename=log_dest, encoding='utf8')
+    file_handler.setFormatter(file_passthrough_formatter)
+    file_handler.setLevel(logging.DEBUG)  # always debug regardless of user input
+    this.FILE_LOG.addHandler(file_handler)
+
+
+# used for integration tests
+def capture_stdout_logs() -> StringIO:
+    capture_buf = io.StringIO()
+    stdout_capture_handler = logging.StreamHandler(capture_buf)
+    stdout_handler.setLevel(logging.DEBUG)
+    this.STDOUT_LOG.addHandler(stdout_capture_handler)
+    return capture_buf
+
+
+# used for integration tests
+def stop_capture_stdout_logs() -> None:
+    this.STDOUT_LOG.handlers = [
+        h for h in this.STDOUT_LOG.handlers
+        if not (hasattr(h, 'stream') and isinstance(h.stream, StringIO))  # type: ignore
+    ]
+
+
+def env_secrets() -> List[str]:
+    return [
+        v for k, v in os.environ.items()
+        if k.startswith(SECRET_ENV_PREFIX)
+    ]
+
+
+def scrub_secrets(msg: str, secrets: List[str]) -> str:
+    scrubbed = msg
+
+    for secret in secrets:
+        scrubbed = scrubbed.replace(secret, "*****")
+
+    return scrubbed
+
+
+# translates an Event to a completely formatted output log_line
+# json=True -> json formatting
+# json=False -> text formatting
+# cli=True -> cli formatting
+# cli=False -> file formatting
+def create_log_line(e: Event, json_fmt: bool, cli_dest: bool) -> str:
+    level = e.level_tag()
+    values: dict = {
+        'pid': e.pid,
+        'msg': '',
+        'level': level if len(level) == 5 else f"{level} "
+    }
+    if cli_dest and isinstance(e, Cli):
+        values['msg'] = scrub_secrets(e.cli_msg(), env_secrets())
+    elif not cli_dest and isinstance(e, File):
+        values['msg'] = scrub_secrets(e.file_msg(), env_secrets())
+
+    if json_fmt:
+        values['ts'] = e.ts.isoformat()
+        log_line = json.dumps(values, sort_keys=True)
+    else:
+        values['ts'] = e.ts.strftime("%H:%M:%S")
+        color_tag = '' if this.format_color else Style.RESET_ALL
+        log_line = f"{color_tag}{values['ts']} | [ {values['level']} ] | {values['msg']}"
+
+    return log_line
+
+
+# allows for resuse of this obnoxious if else tree.
+# do not use for exceptions, it doesn't pass along exc_info, stack_info, or extra
+def send_to_logger(l: Logger, level_tag: str, log_line: str):
+    if level_tag == 'test':
+        # TODO after implmenting #3977 send to new test level
+        l.debug(log_line)
+    elif level_tag == 'debug':
+        l.debug(log_line)
+    elif level_tag == 'info':
+        l.info(log_line)
+    elif level_tag == 'warn':
+        l.warning(log_line)
+    elif level_tag == 'error':
+        l.error(log_line)
+    else:
+        raise AssertionError(
+            f"While attempting to log {log_line}, encountered the unhandled level: {level_tag}"
+        )
+
+
+def send_exc_to_logger(
+    l: Logger,
+    level_tag: str,
+    log_line: str,
+    exc_info=True,
+    stack_info=False,
+    extra=False
+):
+    if level_tag == 'test':
+        # TODO after implmenting #3977 send to new test level
+        l.debug(
+            log_line,
+            exc_info=exc_info,
+            stack_info=stack_info,
+            extra=extra
+        )
+    elif level_tag == 'debug':
+        l.debug(
+            log_line,
+            exc_info=exc_info,
+            stack_info=stack_info,
+            extra=extra
+        )
+    elif level_tag == 'info':
+        l.info(
+            log_line,
+            exc_info=exc_info,
+            stack_info=stack_info,
+            extra=extra
+        )
+    elif level_tag == 'warn':
+        l.warning(
+            log_line,
+            exc_info=exc_info,
+            stack_info=stack_info,
+            extra=extra
+        )
+    elif level_tag == 'error':
+        l.error(
+            log_line,
+            exc_info=exc_info,
+            stack_info=stack_info,
+            extra=extra
+        )
+    else:
+        raise AssertionError(
+            f"While attempting to log {log_line}, encountered the unhandled level: {level_tag}"
+        )
+
+
+# top-level method for accessing the new eventing system
+# this is where all the side effects happen branched by event type
+# (i.e. - mutating the event history, printing to stdout, logging
+# to files, etc.)
+def fire_event(e: Event) -> None:
+    # TODO manage history in phase 2:  EVENT_HISTORY.append(e)
+    # explicitly checking the debug flag here so that potentially expensive-to-construct
+    # log messages are not constructed if debug messages are never shown.
+
+    # backwards compatibility for plugins that require old logger (dbt-rpc)
+    if flags.ENABLE_LEGACY_LOGGER:
+        log_line = create_log_line(e, json_fmt=this.format_json, cli_dest=False)
+        level_tag = e.level_tag()
+        if level_tag == 'debug':
+            GLOBAL_LOGGER.debug(log_line)
+        elif level_tag == 'info':
+            GLOBAL_LOGGER.info(log_line)
+        elif level_tag == 'warn':
+            GLOBAL_LOGGER.warn(log_line)
+        elif level_tag == 'error':
+            GLOBAL_LOGGER.error(log_line)
+        else:
+            raise AssertionError(
+                f"While attempting to log {log_line}, encountered the unhandled level: {level_tag}"
+            )
+        return
+
+    # always logs debug level regardless of user input
+    if isinstance(e, File):
+        log_line = create_log_line(e, json_fmt=this.format_json, cli_dest=False)
+        # doesn't send exceptions to exception logger
+        send_to_logger(FILE_LOG, level_tag=e.level_tag(), log_line=log_line)
+
+    if isinstance(e, Cli):
+        if e.level_tag() == 'debug' and not flags.DEBUG:
+            return  # eat the message in case it was one of the expensive ones
+        log_line = create_log_line(e, json_fmt=this.format_json, cli_dest=True)
+        if not isinstance(e, ShowException):
+            send_to_logger(STDOUT_LOG, level_tag=e.level_tag(), log_line=log_line)
+        # CliEventABC and ShowException
+        else:
+            send_exc_to_logger(
+                STDOUT_LOG,
+                level_tag=e.level_tag(),
+                log_line=log_line,
+                exc_info=e.exc_info,
+                stack_info=e.stack_info,
+                extra=e.extra
+            )

core/dbt/events/history.py

@@ -0,0 +1,7 @@
+from dbt.events.types import Event
+from typing import List
+
+
+# the global history of events for this session
+# TODO this is naive and the memory footprint is likely far too large.
+EVENT_HISTORY: List[Event] = []

core/dbt/events/stubs.py

@@ -0,0 +1,44 @@
+from typing import (
+    Any,
+    Optional,
+    NamedTuple,
+)
+
+# N.B.:
+# These stubs were autogenerated by stubgen and then hacked
+# to pieces to ensure we had something other than "Any" types
+# where using external classes to instantiate event subclasses
+# in events/types.py.
+#
+# This goes away when we turn mypy on for everything.
+#
+# Don't trust them too much at all!
+
+
+class _ReferenceKey(NamedTuple):
+    database: Any
+    schema: Any
+    identifier: Any
+
+
+class _CachedRelation:
+    referenced_by: Any
+    inner: Any
+
+
+class AdapterResponse:
+    code: Optional[str]
+    rows_affected: Optional[int]
+
+
+class BaseRelation:
+    path: Any
+    type: Optional[Any]
+    quote_character: str
+    include_policy: Any
+    quote_policy: Any
+    dbt_created: bool
+
+
+class InformationSchema(BaseRelation):
+    information_schema_view: Optional[str]

core/dbt/events/test_types.py

@@ -0,0 +1,66 @@
+from dataclasses import dataclass
+from .types import (
+    InfoLevel,
+    DebugLevel,
+    WarnLevel,
+    ErrorLevel,
+    ShowException,
+    Cli
+)
+
+
+# Keeping log messages for testing separate since they are used for debugging.
+# Reuse the existing messages when adding logs to tests.
+
+@dataclass
+class IntegrationTestInfo(InfoLevel, Cli):
+    msg: str
+
+    def message(self) -> str:
+        return f"Integration Test: {self.msg}"
+
+
+@dataclass
+class IntegrationTestDebug(DebugLevel, Cli):
+    msg: str
+
+    def message(self) -> str:
+        return f"Integration Test: {self.msg}"
+
+
+@dataclass
+class IntegrationTestWarn(WarnLevel, Cli):
+    msg: str
+
+    def message(self) -> str:
+        return f"Integration Test: {self.msg}"
+
+
+@dataclass
+class IntegrationTestError(ErrorLevel, Cli):
+    msg: str
+
+    def message(self) -> str:
+        return f"Integration Test: {self.msg}"
+
+
+@dataclass
+class IntegrationTestException(ShowException, ErrorLevel, Cli):
+    msg: str
+
+    def message(self) -> str:
+        return f"Integration Test: {self.msg}"
+
+
+# since mypy doesn't run on every file we need to suggest to mypy that every
+# class gets instantiated. But we don't actually want to run this code.
+# making the conditional `if False` causes mypy to skip it as dead code so
+# we need to skirt around that by computing something it doesn't check statically.
+#
+# TODO remove these lines once we run mypy everywhere.
+if 1 == 0:
+    IntegrationTestInfo(msg='')
+    IntegrationTestDebug(msg='')
+    IntegrationTestWarn(msg='')
+    IntegrationTestError(msg='')
+    IntegrationTestException(msg='')

core/dbt/exceptions.py

@@ -2,10 +2,12 @@ import builtins
 import functools
 from typing import NoReturn, Optional, Mapping, Any
 
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.logger import get_secret_env
+from dbt.events.functions import fire_event
+from dbt.events.types import GeneralWarningMsg, GeneralWarningException
 from dbt.node_types import NodeType
 from dbt import flags
-from dbt.ui import line_wrap_message
+from dbt.ui import line_wrap_message, warning_tag
 
 import dbt.dataclass_schema
 
@@ -242,6 +244,15 @@ class ValidationException(RuntimeException):
     MESSAGE = "Validation Error"
 
 
+class ParsingException(RuntimeException):
+    CODE = 10015
+    MESSAGE = "Parsing Error"
+
+    @property
+    def type(self):
+        return 'Parsing'
+
+
 class JSONValidationException(ValidationException):
     def __init__(self, typename, errors):
         self.typename = typename
@@ -390,6 +401,8 @@ class CommandError(RuntimeException):
         super().__init__(message)
         self.cwd = cwd
         self.cmd = cmd
+        for secret in get_secret_env():
+            self.cmd = str(self.cmd).replace(secret, "*****")
         self.args = (cwd, cmd, message)
 
     def __str__(self):
@@ -444,6 +457,10 @@ def raise_compiler_error(msg, node=None) -> NoReturn:
     raise CompilationException(msg, node)
 
 
+def raise_parsing_error(msg, node=None) -> NoReturn:
+    raise ParsingException(msg, node)
+
+
 def raise_database_error(msg, node=None) -> NoReturn:
     raise DatabaseException(msg, node)
 
@@ -466,6 +483,15 @@ def invalid_type_error(method_name, arg_name, got_value, expected_type,
                          got_value=got_value, got_type=got_type))
 
 
+def invalid_bool_error(got_value, macro_name) -> NoReturn:
+    """Raise a CompilationException when an macro expects a boolean but gets some
+    other value.
+    """
+    msg = ("Macro '{macro_name}' returns '{got_value}'.  It is not type 'bool' "
+           "and cannot not be converted reliably to a bool.")
+    raise_compiler_error(msg.format(macro_name=macro_name, got_value=got_value))
+
+
 def ref_invalid_args(model, args) -> NoReturn:
     raise_compiler_error(
         "ref() takes at most two arguments ({} given)".format(len(args)),
@@ -606,14 +632,6 @@ def source_target_not_found(
     raise_compiler_error(msg, model)
 
 
-def ref_disabled_dependency(model, target_model):
-    raise_compiler_error(
-        "Model '{}' depends on model '{}' which is disabled in "
-        "the project config".format(model.unique_id,
-                                    target_model.unique_id),
-        model)
-
-
 def dependency_not_found(model, target_model_name):
     raise_compiler_error(
         "'{}' depends on '{}' which is not in the graph!"
@@ -628,6 +646,20 @@ def macro_not_found(model, target_macro_id):
         .format(model.unique_id, target_macro_id))
 
 
+def macro_invalid_dispatch_arg(macro_name) -> NoReturn:
+    msg = '''\
+    The "packages" argument of adapter.dispatch() has been deprecated.
+    Use the "macro_namespace" argument instead.
+
+    Raised during dispatch for: {}
+
+    For more information, see:
+
+    https://docs.getdbt.com/reference/dbt-jinja-functions/dispatch
+    '''
+    raise_compiler_error(msg.format(macro_name))
+
+
 def materialization_not_available(model, adapter_type):
     materialization = model.get_materialization()
 
@@ -674,6 +706,14 @@ def missing_relation(relation, model=None):
         model)
 
 
+def raise_dataclass_not_dict(obj):
+    msg = (
+        'The object ("{obj}") was used as a dictionary. This '
+        'capability has been removed from objects of this type.'
+    )
+    raise_compiler_error(msg)
+
+
 def relation_wrong_type(relation, expected_type, model=None):
     raise_compiler_error(
         ('Trying to create {expected_type} {relation}, '
@@ -710,7 +750,7 @@ def system_error(operation_name):
     raise_compiler_error(
         "dbt encountered an error when attempting to {}. "
         "If this error persists, please create an issue at: \n\n"
-        "https://github.com/dbt-labs/dbt"
+        "https://github.com/dbt-labs/dbt-core"
         .format(operation_name))
 
 
@@ -916,22 +956,17 @@ def raise_unrecognized_credentials_type(typename, supported_types):
     )
 
 
-def raise_invalid_patch(
-    node, patch_section: str, patch_path: str,
-) -> NoReturn:
+def warn_invalid_patch(patch, resource_type):
     msg = line_wrap_message(
         f'''\
-        '{node.name}' is a {node.resource_type} node, but it is
-        specified in the {patch_section} section of
-        {patch_path}.
-
-
-
-        To fix this error, place the `{node.name}`
-        specification under the {node.resource_type.pluralize()} key instead.
+        '{patch.name}' is a {resource_type} node, but it is
+        specified in the {patch.yaml_key} section of
+        {patch.original_file_path}.
+        To fix this error, place the `{patch.name}`
+        specification under the {resource_type.pluralize()} key instead.
         '''
     )
-    raise_compiler_error(msg, node)
+    warn_or_error(msg, log_fmt=warning_tag('{}'))
 
 
 def raise_not_implemented(msg):
@@ -958,19 +993,14 @@ def warn_or_error(msg, node=None, log_fmt=None):
     if flags.WARN_ERROR:
         raise_compiler_error(msg, node)
     else:
-        if log_fmt is not None:
-            msg = log_fmt.format(msg)
-        logger.warning(msg)
+        fire_event(GeneralWarningMsg(msg=msg, log_fmt=log_fmt))
 
 
 def warn_or_raise(exc, log_fmt=None):
     if flags.WARN_ERROR:
         raise exc
     else:
-        msg = str(exc)
-        if log_fmt is not None:
-            msg = log_fmt.format(msg)
-        logger.warning(msg)
+        fire_event(GeneralWarningException(exc=exc, log_fmt=log_fmt))
 
 
 def warn(msg, node=None):
@@ -993,6 +1023,7 @@ CONTEXT_EXPORTS = {
         raise_ambiguous_alias,
         raise_ambiguous_catalog_match,
         raise_cache_inconsistent,
+        raise_dataclass_not_dict,
         raise_compiler_error,
         raise_database_error,
         raise_dep_not_found,

core/dbt/flags.py

@@ -6,18 +6,52 @@ if os.name != 'nt':
 from pathlib import Path
 from typing import Optional
 
-# initially all flags are set to None, the on-load call of reset() will set
-# them for their first time.
-STRICT_MODE = None
-FULL_REFRESH = None
-USE_CACHE = None
-WARN_ERROR = None
-TEST_NEW_PARSER = None
+# PROFILES_DIR must be set before the other flags
+# It also gets set in main.py and in set_from_args because the rpc server
+# doesn't go through exactly the same main arg processing.
+DEFAULT_PROFILES_DIR = os.path.join(os.path.expanduser('~'), '.dbt')
+PROFILES_DIR = os.path.expanduser(
+    os.getenv('DBT_PROFILES_DIR', DEFAULT_PROFILES_DIR)
+)
+
+STRICT_MODE = False  # Only here for backwards compatibility
+FULL_REFRESH = False  # subcommand
+STORE_FAILURES = False  # subcommand
+EAGER_INDIRECT_SELECTION = True  # subcommand
+
+# Global CLI commands
 USE_EXPERIMENTAL_PARSER = None
+STATIC_PARSER = None
+WARN_ERROR = None
 WRITE_JSON = None
 PARTIAL_PARSE = None
 USE_COLORS = None
-STORE_FAILURES = None
+DEBUG = None
+LOG_FORMAT = None
+VERSION_CHECK = None
+FAIL_FAST = None
+SEND_ANONYMOUS_USAGE_STATS = None
+PRINTER_WIDTH = 80
+WHICH = None
+
+# Global CLI defaults. These flags are set from three places:
+# CLI args, environment variables, and user_config (profiles.yml).
+# Environment variables use the pattern 'DBT_{flag name}', like DBT_PROFILES_DIR
+flag_defaults = {
+    "USE_EXPERIMENTAL_PARSER": False,
+    "STATIC_PARSER": True,
+    "WARN_ERROR": False,
+    "WRITE_JSON": True,
+    "PARTIAL_PARSE": True,
+    "USE_COLORS": True,
+    "PROFILES_DIR": DEFAULT_PROFILES_DIR,
+    "DEBUG": False,
+    "LOG_FORMAT": None,
+    "VERSION_CHECK": True,
+    "FAIL_FAST": False,
+    "SEND_ANONYMOUS_USAGE_STATS": True,
+    "PRINTER_WIDTH": 80
+}
 
 
 def env_set_truthy(key: str) -> Optional[str]:
@@ -30,6 +64,12 @@ def env_set_truthy(key: str) -> Optional[str]:
     return value
 
 
+def env_set_bool(env_value):
+    if env_value in ('1', 't', 'true', 'y', 'yes'):
+        return True
+    return False
+
+
 def env_set_path(key: str) -> Optional[Path]:
     value = os.getenv(key)
     if value is None:
@@ -38,11 +78,10 @@ def env_set_path(key: str) -> Optional[Path]:
         return Path(value)
 
 
-SINGLE_THREADED_WEBSERVER = env_set_truthy('DBT_SINGLE_THREADED_WEBSERVER')
-SINGLE_THREADED_HANDLER = env_set_truthy('DBT_SINGLE_THREADED_HANDLER')
 MACRO_DEBUGGING = env_set_truthy('DBT_MACRO_DEBUGGING')
 DEFER_MODE = env_set_truthy('DBT_DEFER_TO_STATE')
 ARTIFACT_STATE_PATH = env_set_path('DBT_ARTIFACT_STATE_PATH')
+ENABLE_LEGACY_LOGGER = env_set_truthy('DBT_ENABLE_LEGACY_LOGGER')
 
 
 def _get_context():
@@ -50,56 +89,79 @@ def _get_context():
     return multiprocessing.get_context('spawn')
 
 
+# This is not a flag, it's a place to store the lock
 MP_CONTEXT = _get_context()
 
 
-def reset():
-    global STRICT_MODE, FULL_REFRESH, USE_CACHE, WARN_ERROR, TEST_NEW_PARSER, \
-        USE_EXPERIMENTAL_PARSER, WRITE_JSON, PARTIAL_PARSE, MP_CONTEXT, USE_COLORS, \
-        STORE_FAILURES
-
-    STRICT_MODE = False
-    FULL_REFRESH = False
-    USE_CACHE = True
-    WARN_ERROR = False
-    TEST_NEW_PARSER = False
-    USE_EXPERIMENTAL_PARSER = False
-    WRITE_JSON = True
-    PARTIAL_PARSE = False
-    MP_CONTEXT = _get_context()
-    USE_COLORS = True
-    STORE_FAILURES = False
-
-
-def set_from_args(args):
-    global STRICT_MODE, FULL_REFRESH, USE_CACHE, WARN_ERROR, TEST_NEW_PARSER, \
-        USE_EXPERIMENTAL_PARSER, WRITE_JSON, PARTIAL_PARSE, MP_CONTEXT, USE_COLORS, \
-        STORE_FAILURES
-
-    USE_CACHE = getattr(args, 'use_cache', USE_CACHE)
+def set_from_args(args, user_config):
+    global STRICT_MODE, FULL_REFRESH, WARN_ERROR, \
+        USE_EXPERIMENTAL_PARSER, STATIC_PARSER, WRITE_JSON, PARTIAL_PARSE, \
+        USE_COLORS, STORE_FAILURES, PROFILES_DIR, DEBUG, LOG_FORMAT, EAGER_INDIRECT_SELECTION, \
+        VERSION_CHECK, FAIL_FAST, SEND_ANONYMOUS_USAGE_STATS, PRINTER_WIDTH, \
+        WHICH
 
+    STRICT_MODE = False  # backwards compatibility
+    # cli args without user_config or env var option
     FULL_REFRESH = getattr(args, 'full_refresh', FULL_REFRESH)
-    STRICT_MODE = getattr(args, 'strict', STRICT_MODE)
-    WARN_ERROR = (
-        STRICT_MODE or
-        getattr(args, 'warn_error', STRICT_MODE or WARN_ERROR)
-    )
-
-    TEST_NEW_PARSER = getattr(args, 'test_new_parser', TEST_NEW_PARSER)
-    USE_EXPERIMENTAL_PARSER = getattr(args, 'use_experimental_parser', USE_EXPERIMENTAL_PARSER)
-    WRITE_JSON = getattr(args, 'write_json', WRITE_JSON)
-    PARTIAL_PARSE = getattr(args, 'partial_parse', None)
-    MP_CONTEXT = _get_context()
-
-    # The use_colors attribute will always have a value because it is assigned
-    # None by default from the add_mutually_exclusive_group function
-    use_colors_override = getattr(args, 'use_colors')
-
-    if use_colors_override is not None:
-        USE_COLORS = use_colors_override
-
     STORE_FAILURES = getattr(args, 'store_failures', STORE_FAILURES)
+    EAGER_INDIRECT_SELECTION = getattr(args, 'indirect_selection', 'eager') != 'cautious'
+    WHICH = getattr(args, 'which', WHICH)
+
+    # global cli flags with env var and user_config alternatives
+    USE_EXPERIMENTAL_PARSER = get_flag_value('USE_EXPERIMENTAL_PARSER', args, user_config)
+    STATIC_PARSER = get_flag_value('STATIC_PARSER', args, user_config)
+    WARN_ERROR = get_flag_value('WARN_ERROR', args, user_config)
+    WRITE_JSON = get_flag_value('WRITE_JSON', args, user_config)
+    PARTIAL_PARSE = get_flag_value('PARTIAL_PARSE', args, user_config)
+    USE_COLORS = get_flag_value('USE_COLORS', args, user_config)
+    PROFILES_DIR = get_flag_value('PROFILES_DIR', args, user_config)
+    DEBUG = get_flag_value('DEBUG', args, user_config)
+    LOG_FORMAT = get_flag_value('LOG_FORMAT', args, user_config)
+    VERSION_CHECK = get_flag_value('VERSION_CHECK', args, user_config)
+    FAIL_FAST = get_flag_value('FAIL_FAST', args, user_config)
+    SEND_ANONYMOUS_USAGE_STATS = get_flag_value('SEND_ANONYMOUS_USAGE_STATS', args, user_config)
+    PRINTER_WIDTH = get_flag_value('PRINTER_WIDTH', args, user_config)
 
 
-# initialize everything to the defaults on module load
-reset()
+def get_flag_value(flag, args, user_config):
+    lc_flag = flag.lower()
+    flag_value = getattr(args, lc_flag, None)
+    if flag_value is None:
+        # Environment variables use pattern 'DBT_{flag name}'
+        env_flag = f"DBT_{flag}"
+        env_value = os.getenv(env_flag)
+        if env_value is not None and env_value != '':
+            env_value = env_value.lower()
+            # non Boolean values
+            if flag in ['LOG_FORMAT', 'PRINTER_WIDTH', 'PROFILES_DIR']:
+                flag_value = env_value
+            else:
+                flag_value = env_set_bool(env_value)
+        elif user_config is not None and getattr(user_config, lc_flag, None) is not None:
+            flag_value = getattr(user_config, lc_flag)
+        else:
+            flag_value = flag_defaults[flag]
+    if flag == 'PRINTER_WIDTH':  # printer_width must be an int or it hangs
+        flag_value = int(flag_value)
+    if flag == 'PROFILES_DIR':
+        flag_value = os.path.abspath(flag_value)
+
+    return flag_value
+
+
+def get_flag_dict():
+    return {
+        "use_experimental_parser": USE_EXPERIMENTAL_PARSER,
+        "static_parser": STATIC_PARSER,
+        "warn_error": WARN_ERROR,
+        "write_json": WRITE_JSON,
+        "partial_parse": PARTIAL_PARSE,
+        "use_colors": USE_COLORS,
+        "profiles_dir": PROFILES_DIR,
+        "debug": DEBUG,
+        "log_format": LOG_FORMAT,
+        "version_check": VERSION_CHECK,
+        "fail_fast": FAIL_FAST,
+        "send_anonymous_usage_stats": SEND_ANONYMOUS_USAGE_STATS,
+        "printer_width": PRINTER_WIDTH,
+    }

core/dbt/graph/__init__.py

@@ -11,7 +11,6 @@ from .selector import (  # noqa: F401
 )
 from .cli import (  # noqa: F401
     parse_difference,
-    parse_test_selectors,
     parse_from_selectors_definition,
 )
 from .queue import GraphQueue  # noqa: F401

core/dbt/graph/cli.py

@@ -1,4 +1,5 @@
 # special support for CLI argument parsing.
+from dbt import flags
 import itertools
 from dbt.clients.yaml_helper import yaml, Loader, Dumper  # noqa: F401
 
@@ -19,14 +20,12 @@ from .selector_spec import (
 
 INTERSECTION_DELIMITER = ','
 
-DEFAULT_INCLUDES: List[str] = ['fqn:*', 'source:*', 'exposure:*']
+DEFAULT_INCLUDES: List[str] = ['fqn:*', 'source:*', 'exposure:*', 'metric:*']
 DEFAULT_EXCLUDES: List[str] = []
-DATA_TEST_SELECTOR: str = 'test_type:data'
-SCHEMA_TEST_SELECTOR: str = 'test_type:schema'
 
 
 def parse_union(
-    components: List[str], expect_exists: bool, greedy: bool = False
+    components: List[str], expect_exists: bool, eagerly_expand: bool = True
 ) -> SelectionUnion:
     # turn ['a b', 'c'] -> ['a', 'b', 'c']
     raw_specs = itertools.chain.from_iterable(
@@ -37,7 +36,7 @@ def parse_union(
     # ['a', 'b', 'c,d'] -> union('a', 'b', intersection('c', 'd'))
     for raw_spec in raw_specs:
         intersection_components: List[SelectionSpec] = [
-            SelectionCriteria.from_single_spec(part, greedy=greedy)
+            SelectionCriteria.from_single_spec(part, eagerly_expand=eagerly_expand)
             for part in raw_spec.split(INTERSECTION_DELIMITER)
         ]
         union_components.append(SelectionIntersection(
@@ -53,53 +52,26 @@ def parse_union(
 
 
 def parse_union_from_default(
-    raw: Optional[List[str]], default: List[str], greedy: bool = False
+    raw: Optional[List[str]], default: List[str], eagerly_expand: bool = True
 ) -> SelectionUnion:
     components: List[str]
     expect_exists: bool
     if raw is None:
-        return parse_union(components=default, expect_exists=False, greedy=greedy)
+        return parse_union(components=default, expect_exists=False, eagerly_expand=eagerly_expand)
     else:
-        return parse_union(components=raw, expect_exists=True, greedy=greedy)
+        return parse_union(components=raw, expect_exists=True, eagerly_expand=eagerly_expand)
 
 
 def parse_difference(
     include: Optional[List[str]], exclude: Optional[List[str]]
 ) -> SelectionDifference:
-    included = parse_union_from_default(include, DEFAULT_INCLUDES)
-    excluded = parse_union_from_default(exclude, DEFAULT_EXCLUDES, greedy=True)
-    return SelectionDifference(components=[included, excluded])
-
-
-def parse_test_selectors(
-    data: bool, schema: bool, base: SelectionSpec
-) -> SelectionSpec:
-    union_components = []
-
-    if data:
-        union_components.append(
-            SelectionCriteria.from_single_spec(DATA_TEST_SELECTOR)
-        )
-    if schema:
-        union_components.append(
-            SelectionCriteria.from_single_spec(SCHEMA_TEST_SELECTOR)
-        )
-
-    intersect_with: SelectionSpec
-    if not union_components:
-        return base
-    elif len(union_components) == 1:
-        intersect_with = union_components[0]
-    else:  # data and schema tests
-        intersect_with = SelectionUnion(
-            components=union_components,
-            expect_exists=True,
-            raw=[DATA_TEST_SELECTOR, SCHEMA_TEST_SELECTOR],
-        )
-
-    return SelectionIntersection(
-        components=[base, intersect_with], expect_exists=True
+    included = parse_union_from_default(
+        include,
+        DEFAULT_INCLUDES,
+        eagerly_expand=flags.EAGER_INDIRECT_SELECTION
     )
+    excluded = parse_union_from_default(exclude, DEFAULT_EXCLUDES, eagerly_expand=True)
+    return SelectionDifference(components=[included, excluded])
 
 
 RawDefinition = Union[str, Dict[str, Any]]

core/dbt/graph/graph.py

@@ -1,6 +1,7 @@
 from typing import (
     Set, Iterable, Iterator, Optional, NewType
 )
+from itertools import product
 import networkx as nx  # type: ignore
 
 from dbt.exceptions import InternalException
@@ -77,17 +78,26 @@ class Graph:
             successors.update(self.graph.successors(node))
         return successors
 
-    def get_subset_graph(self, selected: Iterable[UniqueId]) -> 'Graph':
+    def get_subset_graph(self, selected: Iterable[UniqueId]) -> "Graph":
         """Create and return a new graph that is a shallow copy of the graph,
         but with only the nodes in include_nodes. Transitive edges across
         removed nodes are preserved as explicit new edges.
         """
-        new_graph = nx.algorithms.transitive_closure(self.graph)
 
+        new_graph = self.graph.copy()
         include_nodes = set(selected)
 
         for node in self:
             if node not in include_nodes:
+                source_nodes = [x for x, _ in new_graph.in_edges(node)]
+                target_nodes = [x for _, x in new_graph.out_edges(node)]
+
+                new_edges = product(source_nodes, target_nodes)
+                non_cyclic_new_edges = [
+                    (source, target) for source, target in new_edges if source != target
+                ]  # removes cyclic refs
+
+                new_graph.add_edges_from(non_cyclic_new_edges)
                 new_graph.remove_node(node)
 
         for node in include_nodes:
@@ -96,6 +106,7 @@ class Graph:
                     "Couldn't find model '{}' -- does it exist or is "
                     "it disabled?".format(node)
                 )
+
         return Graph(new_graph)
 
     def subgraph(self, nodes: Iterable[UniqueId]) -> 'Graph':

core/dbt/graph/queue.py

@@ -5,7 +5,7 @@ from queue import PriorityQueue
 from typing import Dict, Set, List, Generator, Optional
 
 from .graph import UniqueId
-from dbt.contracts.graph.parsed import ParsedSourceDefinition, ParsedExposure
+from dbt.contracts.graph.parsed import ParsedSourceDefinition, ParsedExposure, ParsedMetric
 from dbt.contracts.graph.compiled import GraphMemberNode
 from dbt.contracts.graph.manifest import Manifest
 from dbt.node_types import NodeType
@@ -47,8 +47,8 @@ class GraphQueue:
         node = self.manifest.expect(node_id)
         if node.resource_type != NodeType.Model:
             return False
-        # must be a Model - tell mypy this won't be a Source or Exposure
-        assert not isinstance(node, (ParsedSourceDefinition, ParsedExposure))
+        # must be a Model - tell mypy this won't be a Source or Exposure or Metric
+        assert not isinstance(node, (ParsedSourceDefinition, ParsedExposure, ParsedMetric))
         if node.is_ephemeral:
             return False
         return True

core/dbt/graph/selector.py

@@ -1,4 +1,3 @@
-
 from typing import Set, List, Optional, Tuple
 
 from .graph import Graph, UniqueId
@@ -6,7 +5,8 @@ from .queue import GraphQueue
 from .selector_methods import MethodManager
 from .selector_spec import SelectionCriteria, SelectionSpec
 
-from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.events.functions import fire_event
+from dbt.events.types import SelectorReportInvalidSelector
 from dbt.node_types import NodeType
 from dbt.exceptions import (
     InternalException,
@@ -86,17 +86,17 @@ class NodeSelector(MethodManager):
         try:
             collected = self.select_included(nodes, spec)
         except InvalidSelectorException:
-            valid_selectors = ", ".join(self.SELECTOR_METHODS)
-            logger.info(
-                f"The '{spec.method}' selector specified in {spec.raw} is "
-                f"invalid. Must be one of [{valid_selectors}]"
-            )
+            fire_event(SelectorReportInvalidSelector(
+                selector_methods=self.SELECTOR_METHODS,
+                spec_method=spec.method,
+                raw_spec=spec.raw
+            ))
             return set(), set()
 
         neighbors = self.collect_specified_neighbors(spec, collected)
         direct_nodes, indirect_nodes = self.expand_selection(
             selected=(collected | neighbors),
-            greedy=spec.greedy
+            eagerly_expand=spec.eagerly_expand
         )
         return direct_nodes, indirect_nodes
 
@@ -151,16 +151,16 @@ class NodeSelector(MethodManager):
 
         return direct_nodes, indirect_nodes
 
-    def select_nodes(self, spec: SelectionSpec) -> Set[UniqueId]:
+    def select_nodes(self, spec: SelectionSpec) -> Tuple[Set[UniqueId], Set[UniqueId]]:
         """Select the nodes in the graph according to the spec.
 
         This is the main point of entry for turning a spec into a set of nodes:
         - Recurse through spec, select by criteria, combine by set operation
         - Return final (unfiltered) selection set
         """
-
         direct_nodes, indirect_nodes = self.select_nodes_recursively(spec)
-        return direct_nodes
+        indirect_only = indirect_nodes.difference(direct_nodes)
+        return direct_nodes, indirect_only
 
     def _is_graph_member(self, unique_id: UniqueId) -> bool:
         if unique_id in self.manifest.sources:
@@ -168,6 +168,8 @@ class NodeSelector(MethodManager):
             return source.config.enabled
         elif unique_id in self.manifest.exposures:
             return True
+        elif unique_id in self.manifest.metrics:
+            return True
         node = self.manifest.nodes[unique_id]
         return not node.empty and node.config.enabled
 
@@ -185,6 +187,8 @@ class NodeSelector(MethodManager):
             node = self.manifest.sources[unique_id]
         elif unique_id in self.manifest.exposures:
             node = self.manifest.exposures[unique_id]
+        elif unique_id in self.manifest.metrics:
+            node = self.manifest.metrics[unique_id]
         else:
             raise InternalException(
                 f'Node {unique_id} not found in the manifest!'
@@ -200,19 +204,20 @@ class NodeSelector(MethodManager):
         }
 
     def expand_selection(
-        self, selected: Set[UniqueId], greedy: bool = False
+        self, selected: Set[UniqueId], eagerly_expand: bool = True
     ) -> Tuple[Set[UniqueId], Set[UniqueId]]:
-        # Test selection can expand to include an implicitly/indirectly selected test.
-        # In this way, `dbt test -m model_a` also includes tests that directly depend on `model_a`.
-        # Expansion has two modes, GREEDY and NOT GREEDY.
+        # Test selection by default expands to include an implicitly/indirectly selected tests.
+        # `dbt test -m model_a` also includes tests that directly depend on `model_a`.
+        # Expansion has two modes, EAGER and CAUTIOUS.
         #
-        # GREEDY mode: If ANY parent is selected, select the test. We use this for EXCLUSION.
+        # EAGER mode: If ANY parent is selected, select the test.
         #
-        # NOT GREEDY mode:
+        # CAUTIOUS mode:
         #  - If ALL parents are selected, select the test.
         #  - If ANY parent is missing, return it separately. We'll keep it around
         #    for later and see if its other parents show up.
-        # We use this for INCLUSION.
+        # Users can opt out of inclusive EAGER mode by passing --indirect-selection cautious
+        # CLI argument or by specifying `eagerly_expand: true` in a yaml selector
 
         direct_nodes = set(selected)
         indirect_nodes = set()
@@ -222,7 +227,7 @@ class NodeSelector(MethodManager):
                 node = self.manifest.nodes[unique_id]
                 if can_select_indirectly(node):
                     # should we add it in directly?
-                    if greedy or set(node.depends_on.nodes) <= set(selected):
+                    if eagerly_expand or set(node.depends_on.nodes) <= set(selected):
                         direct_nodes.add(unique_id)
                     # if not:
                     else:
@@ -236,6 +241,10 @@ class NodeSelector(MethodManager):
         # Check tests previously selected indirectly to see if ALL their
         # parents are now present.
 
+        # performance: if identical, skip the processing below
+        if set(direct_nodes) == set(indirect_nodes):
+            return direct_nodes
+
         selected = set(direct_nodes)
 
         for unique_id in indirect_nodes:
@@ -251,15 +260,14 @@ class NodeSelector(MethodManager):
 
             - node selection. Based on the include/exclude sets, the set
                 of matched unique IDs is returned
-                - expand the graph at each leaf node, before combination
-                    - selectors might override this. for example, this is where
-                        tests are added
+                - includes direct + indirect selection (for tests)
             - filtering:
                 - selectors can filter the nodes after all of them have been
                   selected
         """
-        selected_nodes = self.select_nodes(spec)
+        selected_nodes, indirect_only = self.select_nodes(spec)
         filtered_nodes = self.filter_selection(selected_nodes)
+
         return filtered_nodes
 
     def get_graph_queue(self, spec: SelectionSpec) -> GraphQueue:

core/dbt/graph/selector_methods.py

@@ -8,17 +8,18 @@ from dbt.dataclass_schema import StrEnum
 from .graph import UniqueId
 
 from dbt.contracts.graph.compiled import (
-    CompiledDataTestNode,
-    CompiledSchemaTestNode,
+    CompiledSingularTestNode,
+    CompiledGenericTestNode,
     CompileResultNode,
     ManifestNode,
 )
 from dbt.contracts.graph.manifest import Manifest, WritableManifest
 from dbt.contracts.graph.parsed import (
     HasTestMetadata,
-    ParsedDataTestNode,
+    ParsedSingularTestNode,
     ParsedExposure,
-    ParsedSchemaTestNode,
+    ParsedMetric,
+    ParsedGenericTestNode,
     ParsedSourceDefinition,
 )
 from dbt.contracts.state import PreviousState
@@ -45,6 +46,8 @@ class MethodName(StrEnum):
     ResourceType = 'resource_type'
     State = 'state'
     Exposure = 'exposure'
+    Metric = 'metric'
+    Result = 'result'
 
 
 def is_selected_node(fqn: List[str], node_selector: str):
@@ -71,7 +74,7 @@ def is_selected_node(fqn: List[str], node_selector: str):
     return True
 
 
-SelectorTarget = Union[ParsedSourceDefinition, ManifestNode, ParsedExposure]
+SelectorTarget = Union[ParsedSourceDefinition, ManifestNode, ParsedExposure, ParsedMetric]
 
 
 class SelectorMethod(metaclass=abc.ABCMeta):
@@ -118,13 +121,25 @@ class SelectorMethod(metaclass=abc.ABCMeta):
                 continue
             yield unique_id, exposure
 
+    def metric_nodes(
+        self,
+        included_nodes: Set[UniqueId]
+    ) -> Iterator[Tuple[UniqueId, ParsedMetric]]:
+
+        for key, metric in self.manifest.metrics.items():
+            unique_id = UniqueId(key)
+            if unique_id not in included_nodes:
+                continue
+            yield unique_id, metric
+
     def all_nodes(
         self,
         included_nodes: Set[UniqueId]
     ) -> Iterator[Tuple[UniqueId, SelectorTarget]]:
         yield from chain(self.parsed_nodes(included_nodes),
                          self.source_nodes(included_nodes),
-                         self.exposure_nodes(included_nodes))
+                         self.exposure_nodes(included_nodes),
+                         self.metric_nodes(included_nodes))
 
     def configurable_nodes(
         self,
@@ -136,9 +151,10 @@ class SelectorMethod(metaclass=abc.ABCMeta):
     def non_source_nodes(
         self,
         included_nodes: Set[UniqueId],
-    ) -> Iterator[Tuple[UniqueId, Union[ParsedExposure, ManifestNode]]]:
+    ) -> Iterator[Tuple[UniqueId, Union[ParsedExposure, ManifestNode, ParsedMetric]]]:
         yield from chain(self.parsed_nodes(included_nodes),
-                         self.exposure_nodes(included_nodes))
+                         self.exposure_nodes(included_nodes),
+                         self.metric_nodes(included_nodes))
 
     @abc.abstractmethod
     def search(
@@ -250,6 +266,33 @@ class ExposureSelectorMethod(SelectorMethod):
             yield node
 
 
+class MetricSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        parts = selector.split('.')
+        target_package = SELECTOR_GLOB
+        if len(parts) == 1:
+            target_name = parts[0]
+        elif len(parts) == 2:
+            target_package, target_name = parts
+        else:
+            msg = (
+                'Invalid metric selector value "{}". Metrics must be of '
+                'the form ${{metric_name}} or '
+                '${{metric_package.metric_name}}'
+            ).format(selector)
+            raise RuntimeException(msg)
+
+        for node, real_node in self.metric_nodes(included_nodes):
+            if target_package not in (real_node.package_name, SELECTOR_GLOB):
+                continue
+            if target_name not in (real_node.name, SELECTOR_GLOB):
+                continue
+
+            yield node
+
+
 class PathSelectorMethod(SelectorMethod):
     def search(
         self, included_nodes: Set[UniqueId], selector: str
@@ -361,14 +404,15 @@ class TestTypeSelectorMethod(SelectorMethod):
         self, included_nodes: Set[UniqueId], selector: str
     ) -> Iterator[UniqueId]:
         search_types: Tuple[Type, ...]
-        if selector == 'schema':
-            search_types = (ParsedSchemaTestNode, CompiledSchemaTestNode)
-        elif selector == 'data':
-            search_types = (ParsedDataTestNode, CompiledDataTestNode)
+        # continue supporting 'schema' + 'data' for backwards compatibility
+        if selector in ('generic', 'schema'):
+            search_types = (ParsedGenericTestNode, CompiledGenericTestNode)
+        elif selector in ('singular', 'data'):
+            search_types = (ParsedSingularTestNode, CompiledSingularTestNode)
         else:
             raise RuntimeException(
-                f'Invalid test type selector {selector}: expected "data" or '
-                '"schema"'
+                f'Invalid test type selector {selector}: expected "generic" or '
+                '"singular"'
             )
 
         for node, real_node in self.parsed_nodes(included_nodes):
@@ -405,27 +449,38 @@ class StateSelectorMethod(SelectorMethod):
 
         return modified
 
-    def recursively_check_macros_modified(self, node):
-        # check if there are any changes in macros the first time
-        if self.modified_macros is None:
-            self.modified_macros = self._macros_modified()
-
+    def recursively_check_macros_modified(self, node, previous_macros):
         # loop through all macros that this node depends on
         for macro_uid in node.depends_on.macros:
+            # avoid infinite recursion if we've already seen this macro
+            if macro_uid in previous_macros:
+                continue
+            previous_macros.append(macro_uid)
             # is this macro one of the modified macros?
             if macro_uid in self.modified_macros:
                 return True
             # if not, and this macro depends on other macros, keep looping
-            macro = self.manifest.macros[macro_uid]
-            if len(macro.depends_on.macros) > 0:
-                return self.recursively_check_macros_modified(macro)
+            macro_node = self.manifest.macros[macro_uid]
+            if len(macro_node.depends_on.macros) > 0:
+                return self.recursively_check_macros_modified(macro_node, previous_macros)
             else:
                 return False
-        return False
+
+    def check_macros_modified(self, node):
+        # check if there are any changes in macros the first time
+        if self.modified_macros is None:
+            self.modified_macros = self._macros_modified()
+        # no macros have been modified, skip looping entirely
+        if not self.modified_macros:
+            return False
+        # recursively loop through upstream macros to see if any is modified
+        else:
+            previous_macros = []
+            return self.recursively_check_macros_modified(node, previous_macros)
 
     def check_modified(self, old: Optional[SelectorTarget], new: SelectorTarget) -> bool:
         different_contents = not new.same_contents(old)  # type: ignore
-        upstream_macro_change = self.recursively_check_macros_modified(new)
+        upstream_macro_change = self.check_macros_modified(new)
         return different_contents or upstream_macro_change
 
     def check_modified_body(self, old: Optional[SelectorTarget], new: SelectorTarget) -> bool:
@@ -457,7 +512,7 @@ class StateSelectorMethod(SelectorMethod):
             return False
 
     def check_modified_macros(self, _, new: SelectorTarget) -> bool:
-        return self.recursively_check_macros_modified(new)
+        return self.check_macros_modified(new)
 
     def check_new(self, old: Optional[SelectorTarget], new: SelectorTarget) -> bool:
         return old is None
@@ -499,11 +554,30 @@ class StateSelectorMethod(SelectorMethod):
                 previous_node = manifest.sources[node]
             elif node in manifest.exposures:
                 previous_node = manifest.exposures[node]
+            elif node in manifest.metrics:
+                previous_node = manifest.metrics[node]
 
             if checker(previous_node, real_node):
                 yield node
 
 
+class ResultSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        if self.previous_state is None or self.previous_state.results is None:
+            raise InternalException(
+                'No comparison run_results'
+            )
+        matches = set(
+            result.unique_id for result in self.previous_state.results
+            if result.status == selector
+        )
+        for node, real_node in self.all_nodes(included_nodes):
+            if node in matches:
+                yield node
+
+
 class MethodManager:
     SELECTOR_METHODS: Dict[MethodName, Type[SelectorMethod]] = {
         MethodName.FQN: QualifiedNameSelectorMethod,
@@ -514,8 +588,11 @@ class MethodManager:
         MethodName.Config: ConfigSelectorMethod,
         MethodName.TestName: TestNameSelectorMethod,
         MethodName.TestType: TestTypeSelectorMethod,
+        MethodName.ResourceType: ResourceTypeSelectorMethod,
         MethodName.State: StateSelectorMethod,
         MethodName.Exposure: ExposureSelectorMethod,
+        MethodName.Metric: MetricSelectorMethod,
+        MethodName.Result: ResultSelectorMethod,
     }
 
     def __init__(

core/dbt/graph/selector_spec.py

@@ -66,7 +66,7 @@ class SelectionCriteria:
     parents_depth: Optional[int]
     children: bool
     children_depth: Optional[int]
-    greedy: bool = False
+    eagerly_expand: bool = True
 
     def __post_init__(self):
         if self.children and self.childrens_parents:
@@ -104,7 +104,7 @@ class SelectionCriteria:
 
     @classmethod
     def selection_criteria_from_dict(
-        cls, raw: Any, dct: Dict[str, Any], greedy: bool = False
+        cls, raw: Any, dct: Dict[str, Any], eagerly_expand: bool = True
     ) -> 'SelectionCriteria':
         if 'value' not in dct:
             raise RuntimeException(
@@ -114,6 +114,17 @@ class SelectionCriteria:
 
         parents_depth = _match_to_int(dct, 'parents_depth')
         children_depth = _match_to_int(dct, 'children_depth')
+
+        # If defined field in selector, override CLI flag
+        indirect_selection = dct.get('indirect_selection', None)
+        if indirect_selection:
+            if indirect_selection in ['eager', 'cautious']:
+                eagerly_expand = indirect_selection != 'cautious'
+            else:
+                raise RuntimeException(
+                    f'indirect_selection value "{indirect_selection}" is not valid!'
+                )
+
         return cls(
             raw=raw,
             method=method_name,
@@ -124,11 +135,11 @@ class SelectionCriteria:
             parents_depth=parents_depth,
             children=bool(dct.get('children')),
             children_depth=children_depth,
-            greedy=greedy
+            eagerly_expand=eagerly_expand
         )
 
     @classmethod
-    def dict_from_single_spec(cls, raw: str, greedy: bool = False):
+    def dict_from_single_spec(cls, raw: str):
         result = RAW_SELECTOR_PATTERN.match(raw)
         if result is None:
             return {'error': 'Invalid selector spec'}
@@ -148,13 +159,17 @@ class SelectionCriteria:
         return dct
 
     @classmethod
-    def from_single_spec(cls, raw: str, greedy: bool = False) -> 'SelectionCriteria':
+    def from_single_spec(cls, raw: str, eagerly_expand: bool = True) -> 'SelectionCriteria':
         result = RAW_SELECTOR_PATTERN.match(raw)
         if result is None:
             # bad spec!
             raise RuntimeException(f'Invalid selector spec "{raw}"')
 
-        return cls.selection_criteria_from_dict(raw, result.groupdict(), greedy=greedy)
+        return cls.selection_criteria_from_dict(
+            raw,
+            result.groupdict(),
+            eagerly_expand=eagerly_expand
+        )
 
 
 class BaseSelectionGroup(Iterable[SelectionSpec], metaclass=ABCMeta):

core/dbt/include/global_project/dbt_project.yml

@@ -2,5 +2,6 @@ config-version: 2
 name: dbt
 version: 1.0
 
-docs-paths: ['docs']
+docs-paths: ["docs"]
 macro-paths: ["macros"]
+test-paths: ["tests"]

core/dbt/include/global_project/docs/overview.md

@@ -26,7 +26,7 @@ On model pages, you'll see the immediate parents and children of the model you'r
 button at the top-right of this lineage pane, you'll be able to see all of the models that are used to build,
 or are built from, the model you're exploring.
 
-Once expanded, you'll be able to use the `--models` and `--exclude` model selection syntax to filter the
+Once expanded, you'll be able to use the `--select` and `--exclude` model selection syntax to filter the
 models in the graph. For more information on model selection, check out the [dbt docs](https://docs.getdbt.com/docs/model-selection-syntax).
 
 Note that you can also right-click on models to interactively filter and explore the graph.
@@ -38,6 +38,6 @@ Note that you can also right-click on models to interactively filter and explore
 - [What is dbt](https://docs.getdbt.com/docs/overview)?
 - Read the [dbt viewpoint](https://docs.getdbt.com/docs/viewpoint)
 - [Installation](https://docs.getdbt.com/docs/installation)
-- Join the [chat](https://community.getdbt.com/) on Slack for live questions and support.
+- Join the [dbt Community](https://www.getdbt.com/community/) for questions and discussion
 
 {% enddocs %}

core/dbt/include/global_project/macros/adapters/columns.sql

@@ -0,0 +1,89 @@
+{% macro get_columns_in_relation(relation) -%}
+  {{ return(adapter.dispatch('get_columns_in_relation', 'dbt')(relation)) }}
+{% endmacro %}
+
+{% macro default__get_columns_in_relation(relation) -%}
+  {{ exceptions.raise_not_implemented(
+    'get_columns_in_relation macro not implemented for adapter '+adapter.type()) }}
+{% endmacro %}
+
+{# helper for adapter-specific implementations of get_columns_in_relation #}
+{% macro sql_convert_columns_in_relation(table) -%}
+  {% set columns = [] %}
+  {% for row in table %}
+    {% do columns.append(api.Column(*row)) %}
+  {% endfor %}
+  {{ return(columns) }}
+{% endmacro %}
+
+
+{% macro get_columns_in_query(select_sql) -%}
+  {{ return(adapter.dispatch('get_columns_in_query', 'dbt')(select_sql)) }}
+{% endmacro %}
+
+{% macro default__get_columns_in_query(select_sql) %}
+    {% call statement('get_columns_in_query', fetch_result=True, auto_begin=False) -%}
+        select * from (
+            {{ select_sql }}
+        ) as __dbt_sbq
+        where false
+        limit 0
+    {% endcall %}
+
+    {{ return(load_result('get_columns_in_query').table.columns | map(attribute='name') | list) }}
+{% endmacro %}
+
+
+{% macro alter_column_type(relation, column_name, new_column_type) -%}
+  {{ return(adapter.dispatch('alter_column_type', 'dbt')(relation, column_name, new_column_type)) }}
+{% endmacro %}
+
+{% macro default__alter_column_type(relation, column_name, new_column_type) -%}
+  {#
+    1. Create a new column (w/ temp name and correct type)
+    2. Copy data over to it
+    3. Drop the existing column (cascade!)
+    4. Rename the new column to existing column
+  #}
+  {%- set tmp_column = column_name + "__dbt_alter" -%}
+
+  {% call statement('alter_column_type') %}
+    alter table {{ relation }} add column {{ adapter.quote(tmp_column) }} {{ new_column_type }};
+    update {{ relation }} set {{ adapter.quote(tmp_column) }} = {{ adapter.quote(column_name) }};
+    alter table {{ relation }} drop column {{ adapter.quote(column_name) }} cascade;
+    alter table {{ relation }} rename column {{ adapter.quote(tmp_column) }} to {{ adapter.quote(column_name) }}
+  {% endcall %}
+
+{% endmacro %}
+
+
+{% macro alter_relation_add_remove_columns(relation, add_columns = none, remove_columns = none) -%}
+  {{ return(adapter.dispatch('alter_relation_add_remove_columns', 'dbt')(relation, add_columns, remove_columns)) }}
+{% endmacro %}
+
+{% macro default__alter_relation_add_remove_columns(relation, add_columns, remove_columns) %}
+  
+  {% if add_columns is none %}
+    {% set add_columns = [] %}
+  {% endif %}
+  {% if remove_columns is none %}
+    {% set remove_columns = [] %}
+  {% endif %}
+  
+  {% set sql -%}
+     
+     alter {{ relation.type }} {{ relation }}
+       
+            {% for column in add_columns %}
+               add column {{ column.name }} {{ column.data_type }}{{ ',' if not loop.last }}
+            {% endfor %}{{ ',' if add_columns and remove_columns }}
+            
+            {% for column in remove_columns %}
+                drop column {{ column.name }}{{ ',' if not loop.last }}
+            {% endfor %}
+  
+  {%- endset -%}
+
+  {% do run_query(sql) %}
+
+{% endmacro %}

core/dbt/include/global_project/macros/adapters/common.sql

@@ -1,344 +0,0 @@
-{% macro get_columns_in_query(select_sql) -%}
-  {{ return(adapter.dispatch('get_columns_in_query', 'dbt')(select_sql)) }}
-{% endmacro %}
-
-{% macro default__get_columns_in_query(select_sql) %}
-    {% call statement('get_columns_in_query', fetch_result=True, auto_begin=False) -%}
-        select * from (
-            {{ select_sql }}
-        ) as __dbt_sbq
-        where false
-        limit 0
-    {% endcall %}
-
-    {{ return(load_result('get_columns_in_query').table.columns | map(attribute='name') | list) }}
-{% endmacro %}
-
-{% macro create_schema(relation) -%}
-  {{ adapter.dispatch('create_schema', 'dbt')(relation) }}
-{% endmacro %}
-
-{% macro default__create_schema(relation) -%}
-  {%- call statement('create_schema') -%}
-    create schema if not exists {{ relation.without_identifier() }}
-  {% endcall %}
-{% endmacro %}
-
-{% macro drop_schema(relation) -%}
-  {{ adapter.dispatch('drop_schema', 'dbt')(relation) }}
-{% endmacro %}
-
-{% macro default__drop_schema(relation) -%}
-  {%- call statement('drop_schema') -%}
-    drop schema if exists {{ relation.without_identifier() }} cascade
-  {% endcall %}
-{% endmacro %}
-
-{% macro create_table_as(temporary, relation, sql) -%}
-  {{ adapter.dispatch('create_table_as', 'dbt')(temporary, relation, sql) }}
-{%- endmacro %}
-
-{% macro default__create_table_as(temporary, relation, sql) -%}
-  {%- set sql_header = config.get('sql_header', none) -%}
-
-  {{ sql_header if sql_header is not none }}
-
-  create {% if temporary: -%}temporary{%- endif %} table
-    {{ relation.include(database=(not temporary), schema=(not temporary)) }}
-  as (
-    {{ sql }}
-  );
-
-{% endmacro %}
-
-{% macro get_create_index_sql(relation, index_dict) -%}
-  {{ return(adapter.dispatch('get_create_index_sql', 'dbt')(relation, index_dict)) }}
-{% endmacro %}
-
-{% macro default__get_create_index_sql(relation, index_dict) -%}
-  {% do return(None) %}
-{% endmacro %}
-
-{% macro create_indexes(relation) -%}
-  {{ adapter.dispatch('create_indexes', 'dbt')(relation) }}
-{%- endmacro %}
-
-{% macro default__create_indexes(relation) -%}
-  {%- set _indexes = config.get('indexes', default=[]) -%}
-
-  {% for _index_dict in _indexes %}
-    {% set create_index_sql = get_create_index_sql(relation, _index_dict) %}
-    {% if create_index_sql %}
-      {% do run_query(create_index_sql) %}
-    {% endif %}
-  {% endfor %}
-{% endmacro %}
-
-{% macro create_view_as(relation, sql) -%}
-  {{ adapter.dispatch('create_view_as', 'dbt')(relation, sql) }}
-{%- endmacro %}
-
-{% macro default__create_view_as(relation, sql) -%}
-  {%- set sql_header = config.get('sql_header', none) -%}
-
-  {{ sql_header if sql_header is not none }}
-  create view {{ relation }} as (
-    {{ sql }}
-  );
-{% endmacro %}
-
-
-{% macro get_catalog(information_schema, schemas) -%}
-  {{ return(adapter.dispatch('get_catalog', 'dbt')(information_schema, schemas)) }}
-{%- endmacro %}
-
-{% macro default__get_catalog(information_schema, schemas) -%}
-
-  {% set typename = adapter.type() %}
-  {% set msg -%}
-    get_catalog not implemented for {{ typename }}
-  {%- endset %}
-
-  {{ exceptions.raise_compiler_error(msg) }}
-{% endmacro %}
-
-
-{% macro get_columns_in_relation(relation) -%}
-  {{ return(adapter.dispatch('get_columns_in_relation', 'dbt')(relation)) }}
-{% endmacro %}
-
-{% macro sql_convert_columns_in_relation(table) -%}
-  {% set columns = [] %}
-  {% for row in table %}
-    {% do columns.append(api.Column(*row)) %}
-  {% endfor %}
-  {{ return(columns) }}
-{% endmacro %}
-
-{% macro default__get_columns_in_relation(relation) -%}
-  {{ exceptions.raise_not_implemented(
-    'get_columns_in_relation macro not implemented for adapter '+adapter.type()) }}
-{% endmacro %}
-
-{% macro alter_column_type(relation, column_name, new_column_type) -%}
-  {{ return(adapter.dispatch('alter_column_type', 'dbt')(relation, column_name, new_column_type)) }}
-{% endmacro %}
-
-
-
-{% macro alter_column_comment(relation, column_dict) -%}
-  {{ return(adapter.dispatch('alter_column_comment', 'dbt')(relation, column_dict)) }}
-{% endmacro %}
-
-{% macro default__alter_column_comment(relation, column_dict) -%}
-  {{ exceptions.raise_not_implemented(
-    'alter_column_comment macro not implemented for adapter '+adapter.type()) }}
-{% endmacro %}
-
-{% macro alter_relation_comment(relation, relation_comment) -%}
-  {{ return(adapter.dispatch('alter_relation_comment', 'dbt')(relation, relation_comment)) }}
-{% endmacro %}
-
-{% macro default__alter_relation_comment(relation, relation_comment) -%}
-  {{ exceptions.raise_not_implemented(
-    'alter_relation_comment macro not implemented for adapter '+adapter.type()) }}
-{% endmacro %}
-
-{% macro persist_docs(relation, model, for_relation=true, for_columns=true) -%}
-  {{ return(adapter.dispatch('persist_docs', 'dbt')(relation, model, for_relation, for_columns)) }}
-{% endmacro %}
-
-{% macro default__persist_docs(relation, model, for_relation, for_columns) -%}
-  {% if for_relation and config.persist_relation_docs() and model.description %}
-    {% do run_query(alter_relation_comment(relation, model.description)) %}
-  {% endif %}
-
-  {% if for_columns and config.persist_column_docs() and model.columns %}
-    {% do run_query(alter_column_comment(relation, model.columns)) %}
-  {% endif %}
-{% endmacro %}
-
-
-
-{% macro default__alter_column_type(relation, column_name, new_column_type) -%}
-  {#
-    1. Create a new column (w/ temp name and correct type)
-    2. Copy data over to it
-    3. Drop the existing column (cascade!)
-    4. Rename the new column to existing column
-  #}
-  {%- set tmp_column = column_name + "__dbt_alter" -%}
-
-  {% call statement('alter_column_type') %}
-    alter table {{ relation }} add column {{ adapter.quote(tmp_column) }} {{ new_column_type }};
-    update {{ relation }} set {{ adapter.quote(tmp_column) }} = {{ adapter.quote(column_name) }};
-    alter table {{ relation }} drop column {{ adapter.quote(column_name) }} cascade;
-    alter table {{ relation }} rename column {{ adapter.quote(tmp_column) }} to {{ adapter.quote(column_name) }}
-  {% endcall %}
-
-{% endmacro %}
-
-
-{% macro drop_relation(relation) -%}
-  {{ return(adapter.dispatch('drop_relation', 'dbt')(relation)) }}
-{% endmacro %}
-
-
-{% macro default__drop_relation(relation) -%}
-  {% call statement('drop_relation', auto_begin=False) -%}
-    drop {{ relation.type }} if exists {{ relation }} cascade
-  {%- endcall %}
-{% endmacro %}
-
-{% macro truncate_relation(relation) -%}
-  {{ return(adapter.dispatch('truncate_relation', 'dbt')(relation)) }}
-{% endmacro %}
-
-
-{% macro default__truncate_relation(relation) -%}
-  {% call statement('truncate_relation') -%}
-    truncate table {{ relation }}
-  {%- endcall %}
-{% endmacro %}
-
-{% macro rename_relation(from_relation, to_relation) -%}
-  {{ return(adapter.dispatch('rename_relation', 'dbt')(from_relation, to_relation)) }}
-{% endmacro %}
-
-{% macro default__rename_relation(from_relation, to_relation) -%}
-  {% set target_name = adapter.quote_as_configured(to_relation.identifier, 'identifier') %}
-  {% call statement('rename_relation') -%}
-    alter table {{ from_relation }} rename to {{ target_name }}
-  {%- endcall %}
-{% endmacro %}
-
-
-{% macro information_schema_name(database) %}
-  {{ return(adapter.dispatch('information_schema_name', 'dbt')(database)) }}
-{% endmacro %}
-
-{% macro default__information_schema_name(database) -%}
-  {%- if database -%}
-    {{ database }}.INFORMATION_SCHEMA
-  {%- else -%}
-    INFORMATION_SCHEMA
-  {%- endif -%}
-{%- endmacro %}
-
-
-{% macro list_schemas(database) -%}
-  {{ return(adapter.dispatch('list_schemas', 'dbt')(database)) }}
-{% endmacro %}
-
-{% macro default__list_schemas(database) -%}
-  {% set sql %}
-    select distinct schema_name
-    from {{ information_schema_name(database) }}.SCHEMATA
-    where catalog_name ilike '{{ database }}'
-  {% endset %}
-  {{ return(run_query(sql)) }}
-{% endmacro %}
-
-
-{% macro check_schema_exists(information_schema, schema) -%}
-  {{ return(adapter.dispatch('check_schema_exists', 'dbt')(information_schema, schema)) }}
-{% endmacro %}
-
-{% macro default__check_schema_exists(information_schema, schema) -%}
-  {% set sql -%}
-        select count(*)
-        from {{ information_schema.replace(information_schema_view='SCHEMATA') }}
-        where catalog_name='{{ information_schema.database }}'
-          and schema_name='{{ schema }}'
-  {%- endset %}
-  {{ return(run_query(sql)) }}
-{% endmacro %}
-
-
-{% macro list_relations_without_caching(schema_relation) %}
-  {{ return(adapter.dispatch('list_relations_without_caching', 'dbt')(schema_relation)) }}
-{% endmacro %}
-
-
-{% macro default__list_relations_without_caching(schema_relation) %}
-  {{ exceptions.raise_not_implemented(
-    'list_relations_without_caching macro not implemented for adapter '+adapter.type()) }}
-{% endmacro %}
-
-
-{% macro current_timestamp() -%}
-  {{ adapter.dispatch('current_timestamp', 'dbt')() }}
-{%- endmacro %}
-
-
-{% macro default__current_timestamp() -%}
-  {{ exceptions.raise_not_implemented(
-    'current_timestamp macro not implemented for adapter '+adapter.type()) }}
-{%- endmacro %}
-
-
-{% macro collect_freshness(source, loaded_at_field, filter) %}
-  {{ return(adapter.dispatch('collect_freshness', 'dbt')(source, loaded_at_field, filter))}}
-{% endmacro %}
-
-
-{% macro default__collect_freshness(source, loaded_at_field, filter) %}
-  {% call statement('collect_freshness', fetch_result=True, auto_begin=False) -%}
-    select
-      max({{ loaded_at_field }}) as max_loaded_at,
-      {{ current_timestamp() }} as snapshotted_at
-    from {{ source }}
-    {% if filter %}
-    where {{ filter }}
-    {% endif %}
-  {% endcall %}
-  {{ return(load_result('collect_freshness').table) }}
-{% endmacro %}
-
-{% macro make_temp_relation(base_relation, suffix='__dbt_tmp') %}
-  {{ return(adapter.dispatch('make_temp_relation', 'dbt')(base_relation, suffix))}}
-{% endmacro %}
-
-{% macro default__make_temp_relation(base_relation, suffix) %}
-    {% set tmp_identifier = base_relation.identifier ~ suffix %}
-    {% set tmp_relation = base_relation.incorporate(
-                                path={"identifier": tmp_identifier}) -%}
-
-    {% do return(tmp_relation) %}
-{% endmacro %}
-
-{% macro set_sql_header(config) -%}
-  {{ config.set('sql_header', caller()) }}
-{%- endmacro %}
-
-
-{% macro alter_relation_add_remove_columns(relation, add_columns = none, remove_columns = none) -%}
-  {{ return(adapter.dispatch('alter_relation_add_remove_columns', 'dbt')(relation, add_columns, remove_columns)) }}
-{% endmacro %}
-
-{% macro default__alter_relation_add_remove_columns(relation, add_columns, remove_columns) %}
-  
-  {% if add_columns is none %}
-    {% set add_columns = [] %}
-  {% endif %}
-  {% if remove_columns is none %}
-    {% set remove_columns = [] %}
-  {% endif %}
-  
-  {% set sql -%}
-     
-     alter {{ relation.type }} {{ relation }}
-       
-            {% for column in add_columns %}
-               add column {{ column.name }} {{ column.data_type }}{{ ',' if not loop.last }}
-            {% endfor %}{{ ',' if remove_columns | length > 0 }}
-            
-            {% for column in remove_columns %}
-                drop column {{ column.name }}{{ ',' if not loop.last }}
-            {% endfor %}
-  
-  {%- endset -%}
-
-  {% do run_query(sql) %}
-
-{% endmacro %}

core/dbt/include/global_project/macros/adapters/freshness.sql

@@ -0,0 +1,26 @@
+{% macro current_timestamp() -%}
+  {{ adapter.dispatch('current_timestamp', 'dbt')() }}
+{%- endmacro %}
+
+{% macro default__current_timestamp() -%}
+  {{ exceptions.raise_not_implemented(
+    'current_timestamp macro not implemented for adapter '+adapter.type()) }}
+{%- endmacro %}
+
+
+{% macro collect_freshness(source, loaded_at_field, filter) %}
+  {{ return(adapter.dispatch('collect_freshness', 'dbt')(source, loaded_at_field, filter))}}
+{% endmacro %}
+
+{% macro default__collect_freshness(source, loaded_at_field, filter) %}
+  {% call statement('collect_freshness', fetch_result=True, auto_begin=False) -%}
+    select
+      max({{ loaded_at_field }}) as max_loaded_at,
+      {{ current_timestamp() }} as snapshotted_at
+    from {{ source }}
+    {% if filter %}
+    where {{ filter }}
+    {% endif %}
+  {% endcall %}
+  {{ return(load_result('collect_freshness').table) }}
+{% endmacro %}

core/dbt/include/global_project/macros/adapters/indexes.sql

@@ -0,0 +1,23 @@
+{% macro get_create_index_sql(relation, index_dict) -%}
+  {{ return(adapter.dispatch('get_create_index_sql', 'dbt')(relation, index_dict)) }}
+{% endmacro %}
+
+{% macro default__get_create_index_sql(relation, index_dict) -%}
+  {% do return(None) %}
+{% endmacro %}
+
+
+{% macro create_indexes(relation) -%}
+  {{ adapter.dispatch('create_indexes', 'dbt')(relation) }}
+{%- endmacro %}
+
+{% macro default__create_indexes(relation) -%}
+  {%- set _indexes = config.get('indexes', default=[]) -%}
+
+  {% for _index_dict in _indexes %}
+    {% set create_index_sql = get_create_index_sql(relation, _index_dict) %}
+    {% if create_index_sql %}
+      {% do run_query(create_index_sql) %}
+    {% endif %}
+  {% endfor %}
+{% endmacro %}

core/dbt/include/global_project/macros/adapters/metadata.sql

@@ -0,0 +1,65 @@
+{% macro get_catalog(information_schema, schemas) -%}
+  {{ return(adapter.dispatch('get_catalog', 'dbt')(information_schema, schemas)) }}
+{%- endmacro %}
+
+{% macro default__get_catalog(information_schema, schemas) -%}
+
+  {% set typename = adapter.type() %}
+  {% set msg -%}
+    get_catalog not implemented for {{ typename }}
+  {%- endset %}
+
+  {{ exceptions.raise_compiler_error(msg) }}
+{% endmacro %}
+
+
+{% macro information_schema_name(database) %}
+  {{ return(adapter.dispatch('information_schema_name', 'dbt')(database)) }}
+{% endmacro %}
+
+{% macro default__information_schema_name(database) -%}
+  {%- if database -%}
+    {{ database }}.INFORMATION_SCHEMA
+  {%- else -%}
+    INFORMATION_SCHEMA
+  {%- endif -%}
+{%- endmacro %}
+
+
+{% macro list_schemas(database) -%}
+  {{ return(adapter.dispatch('list_schemas', 'dbt')(database)) }}
+{% endmacro %}
+
+{% macro default__list_schemas(database) -%}
+  {% set sql %}
+    select distinct schema_name
+    from {{ information_schema_name(database) }}.SCHEMATA
+    where catalog_name ilike '{{ database }}'
+  {% endset %}
+  {{ return(run_query(sql)) }}
+{% endmacro %}
+
+
+{% macro check_schema_exists(information_schema, schema) -%}
+  {{ return(adapter.dispatch('check_schema_exists', 'dbt')(information_schema, schema)) }}
+{% endmacro %}
+
+{% macro default__check_schema_exists(information_schema, schema) -%}
+  {% set sql -%}
+        select count(*)
+        from {{ information_schema.replace(information_schema_view='SCHEMATA') }}
+        where catalog_name='{{ information_schema.database }}'
+          and schema_name='{{ schema }}'
+  {%- endset %}
+  {{ return(run_query(sql)) }}
+{% endmacro %}
+
+
+{% macro list_relations_without_caching(schema_relation) %}
+  {{ return(adapter.dispatch('list_relations_without_caching', 'dbt')(schema_relation)) }}
+{% endmacro %}
+
+{% macro default__list_relations_without_caching(schema_relation) %}
+  {{ exceptions.raise_not_implemented(
+    'list_relations_without_caching macro not implemented for adapter '+adapter.type()) }}
+{% endmacro %}

core/dbt/include/global_project/macros/adapters/persist_docs.sql

@@ -0,0 +1,33 @@
+{% macro alter_column_comment(relation, column_dict) -%}
+  {{ return(adapter.dispatch('alter_column_comment', 'dbt')(relation, column_dict)) }}
+{% endmacro %}
+
+{% macro default__alter_column_comment(relation, column_dict) -%}
+  {{ exceptions.raise_not_implemented(
+    'alter_column_comment macro not implemented for adapter '+adapter.type()) }}
+{% endmacro %}
+
+
+{% macro alter_relation_comment(relation, relation_comment) -%}
+  {{ return(adapter.dispatch('alter_relation_comment', 'dbt')(relation, relation_comment)) }}
+{% endmacro %}
+
+{% macro default__alter_relation_comment(relation, relation_comment) -%}
+  {{ exceptions.raise_not_implemented(
+    'alter_relation_comment macro not implemented for adapter '+adapter.type()) }}
+{% endmacro %}
+
+
+{% macro persist_docs(relation, model, for_relation=true, for_columns=true) -%}
+  {{ return(adapter.dispatch('persist_docs', 'dbt')(relation, model, for_relation, for_columns)) }}
+{% endmacro %}
+
+{% macro default__persist_docs(relation, model, for_relation, for_columns) -%}
+  {% if for_relation and config.persist_relation_docs() and model.description %}
+    {% do run_query(alter_relation_comment(relation, model.description)) %}
+  {% endif %}
+
+  {% if for_columns and config.persist_column_docs() and model.columns %}
+    {% do run_query(alter_column_comment(relation, model.columns)) %}
+  {% endif %}
+{% endmacro %}

core/dbt/include/global_project/macros/adapters/relation.sql

@@ -0,0 +1,84 @@
+{% macro make_temp_relation(base_relation, suffix='__dbt_tmp') %}
+  {{ return(adapter.dispatch('make_temp_relation', 'dbt')(base_relation, suffix))}}
+{% endmacro %}
+
+{% macro default__make_temp_relation(base_relation, suffix) %}
+    {% set tmp_identifier = base_relation.identifier ~ suffix %}
+    {% set tmp_relation = base_relation.incorporate(
+                                path={"identifier": tmp_identifier}) -%}
+
+    {% do return(tmp_relation) %}
+{% endmacro %}
+
+
+{% macro drop_relation(relation) -%}
+  {{ return(adapter.dispatch('drop_relation', 'dbt')(relation)) }}
+{% endmacro %}
+
+{% macro default__drop_relation(relation) -%}
+  {% call statement('drop_relation', auto_begin=False) -%}
+    drop {{ relation.type }} if exists {{ relation }} cascade
+  {%- endcall %}
+{% endmacro %}
+
+
+{% macro truncate_relation(relation) -%}
+  {{ return(adapter.dispatch('truncate_relation', 'dbt')(relation)) }}
+{% endmacro %}
+
+{% macro default__truncate_relation(relation) -%}
+  {% call statement('truncate_relation') -%}
+    truncate table {{ relation }}
+  {%- endcall %}
+{% endmacro %}
+
+
+{% macro rename_relation(from_relation, to_relation) -%}
+  {{ return(adapter.dispatch('rename_relation', 'dbt')(from_relation, to_relation)) }}
+{% endmacro %}
+
+{% macro default__rename_relation(from_relation, to_relation) -%}
+  {% set target_name = adapter.quote_as_configured(to_relation.identifier, 'identifier') %}
+  {% call statement('rename_relation') -%}
+    alter table {{ from_relation }} rename to {{ target_name }}
+  {%- endcall %}
+{% endmacro %}
+
+
+{% macro get_or_create_relation(database, schema, identifier, type) -%}
+  {{ return(adapter.dispatch('get_or_create_relation', 'dbt')(database, schema, identifier, type)) }}
+{% endmacro %}
+
+{% macro default__get_or_create_relation(database, schema, identifier, type) %}
+  {%- set target_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) %}
+
+  {% if target_relation %}
+    {% do return([true, target_relation]) %}
+  {% endif %}
+
+  {%- set new_relation = api.Relation.create(
+      database=database,
+      schema=schema,
+      identifier=identifier,
+      type=type
+  ) -%}
+  {% do return([false, new_relation]) %}
+{% endmacro %}
+
+
+{# a user-friendly interface into adapter.get_relation #}
+{% macro load_relation(relation) %}
+  {% do return(adapter.get_relation(
+    database=relation.database,
+    schema=relation.schema,
+    identifier=relation.identifier
+  )) -%}
+{% endmacro %}
+
+
+{# not used much, here for backwards compatibility #}
+{% macro drop_relation_if_exists(relation) %}
+  {% if relation is not none %}
+    {{ adapter.drop_relation(relation) }}
+  {% endif %}
+{% endmacro %}

core/dbt/include/global_project/macros/adapters/schema.sql

@@ -0,0 +1,20 @@
+{% macro create_schema(relation) -%}
+  {{ adapter.dispatch('create_schema', 'dbt')(relation) }}
+{% endmacro %}
+
+{% macro default__create_schema(relation) -%}
+  {%- call statement('create_schema') -%}
+    create schema if not exists {{ relation.without_identifier() }}
+  {% endcall %}
+{% endmacro %}
+
+
+{% macro drop_schema(relation) -%}
+  {{ adapter.dispatch('drop_schema', 'dbt')(relation) }}
+{% endmacro %}
+
+{% macro default__drop_schema(relation) -%}
+  {%- call statement('drop_schema') -%}
+    drop schema if exists {{ relation.without_identifier() }} cascade
+  {% endcall %}
+{% endmacro %}

core/dbt/include/global_project/macros/etc/datetime.sql

@@ -1,4 +1,3 @@
-
 {% macro convert_datetime(date_str, date_fmt) %}
 
   {% set error_msg -%}
@@ -10,6 +9,7 @@
 
 {% endmacro %}
 
+
 {% macro dates_in_range(start_date_str, end_date_str=none, in_fmt="%Y%m%d", out_fmt="%Y%m%d") %}
     {% set end_date_str = start_date_str if end_date_str is none else end_date_str %}
 
@@ -38,6 +38,7 @@
     {{ return(date_list) }}
 {% endmacro %}
 
+
 {% macro partition_range(raw_partition_date, date_fmt='%Y%m%d') %}
     {% set partition_range = (raw_partition_date | string).split(",") %}
 
@@ -54,6 +55,7 @@
     {{ return(dates_in_range(start_date, end_date, in_fmt=date_fmt)) }}
 {% endmacro %}
 
+
 {% macro py_current_timestring() %}
     {% set dt = modules.datetime.datetime.now() %}
     {% do return(dt.strftime("%Y%m%d%H%M%S%f")) %}

core/dbt/include/global_project/macros/etc/query.sql

@@ -1,8 +0,0 @@
-
-{% macro run_query(sql) %}
-  {% call statement("run_query_statement", fetch_result=true, auto_begin=false) %}
-    {{ sql }}
-  {% endcall %}
-
-  {% do return(load_result("run_query_statement").table) %}
-{% endmacro %}