point to rust module

Clean up docker resources

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.14.0rc1
+current_version = 0.19.0
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)
@@ -34,3 +34,11 @@ first_value = 1
 
 [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]
+

.circleci/config.yml

@@ -1,8 +1,38 @@
-version: 2
+version: 2.1
 jobs:
   unit:
+    docker: &test_only
+      - image: fishtownanalytics/test-container:9
+        environment:
+          DBT_INVOCATION_ENV: circle
+    steps:
+      - checkout
+      - run: tox -e flake8,mypy,unit-py36,unit-py38
+  build-wheels:
+    docker: *test_only
+    steps:
+      - checkout
+      - run:
+          name: Build wheels
+          command: |
+            python3.8 -m venv "${PYTHON_ENV}"
+            export PYTHON_BIN="${PYTHON_ENV}/bin/python"
+            $PYTHON_BIN -m pip install -U pip setuptools
+            $PYTHON_BIN -m pip install -r requirements.txt
+            $PYTHON_BIN -m pip install -r dev_requirements.txt
+            /bin/bash ./scripts/build-wheels.sh
+            $PYTHON_BIN ./scripts/collect-dbt-contexts.py > ./dist/context_metadata.json
+            $PYTHON_BIN ./scripts/collect-artifact-schema.py > ./dist/artifact_schemas.json
+          environment:
+            PYTHON_ENV: /home/tox/build_venv/
+      - store_artifacts:
+          path: ./dist
+          destination: dist
+  integration-postgres-py36:
     docker: &test_and_postgres
-      - image: fishtownjacob/test-container
+      - image: fishtownanalytics/test-container:9
+        environment:
+          DBT_INVOCATION_ENV: circle
       - image: postgres
         name: database
         environment: &pgenv
@@ -19,20 +49,13 @@ jobs:
             PGUSER: root
             PGPASSWORD: password
             PGDATABASE: postgres
-      - run: tox -e flake8,unit-py27,unit-py36
-  integration-postgres-py36:
-    docker: *test_and_postgres
-    steps:
-      - checkout
-      - run: *setupdb
       - run:
           name: Run tests
           command: tox -e integration-postgres-py36
       - store_artifacts:
           path: ./logs
   integration-snowflake-py36:
-    docker: &test_only
-      - image: fishtownjacob/test-container
+    docker: *test_only
     steps:
       - checkout
       - run:
@@ -59,42 +82,81 @@ jobs:
           command: tox -e integration-bigquery-py36
       - store_artifacts:
           path: ./logs
-  integration-postgres-py27:
+  integration-postgres-py38:
     docker: *test_and_postgres
     steps:
       - checkout
       - run: *setupdb
       - run:
           name: Run tests
-          command: tox -e integration-postgres-py27
+          command: tox -e integration-postgres-py38
       - store_artifacts:
           path: ./logs
-  integration-snowflake-py27:
+  integration-snowflake-py38:
     docker: *test_only
     steps:
       - checkout
       - run:
           name: Run tests
-          command: tox -e integration-snowflake-py27
+          command: tox -e integration-snowflake-py38
           no_output_timeout: 1h
       - store_artifacts:
           path: ./logs
-  integration-redshift-py27:
+  integration-redshift-py38:
     docker: *test_only
     steps:
       - checkout
       - run:
           name: Run tests
-          command: tox -e integration-redshift-py27
+          command: tox -e integration-redshift-py38
       - store_artifacts:
           path: ./logs
-  integration-bigquery-py27:
+  integration-bigquery-py38:
     docker: *test_only
     steps:
       - checkout
       - run:
           name: Run tests
-          command: tox -e integration-bigquery-py27
+          command: tox -e integration-bigquery-py38
+      - store_artifacts:
+          path: ./logs
+
+  integration-postgres-py39:
+    docker: *test_and_postgres
+    steps:
+      - checkout
+      - run: *setupdb
+      - run:
+          name: Run tests
+          command: tox -e integration-postgres-py39
+      - store_artifacts:
+          path: ./logs
+  integration-snowflake-py39:
+    docker: *test_only
+    steps:
+      - checkout
+      - run:
+          name: Run tests
+          command: tox -e integration-snowflake-py39
+          no_output_timeout: 1h
+      - store_artifacts:
+          path: ./logs
+  integration-redshift-py39:
+    docker: *test_only
+    steps:
+      - checkout
+      - run:
+          name: Run tests
+          command: tox -e integration-redshift-py39
+      - store_artifacts:
+          path: ./logs
+  integration-bigquery-py39:
+    docker: *test_only
+    steps:
+      - checkout
+      - run:
+          name: Run tests
+          command: tox -e integration-bigquery-py39
       - store_artifacts:
           path: ./logs
 
@@ -106,18 +168,6 @@ workflows:
       - integration-postgres-py36:
           requires:
             - unit
-      - integration-postgres-py27:
-          requires:
-            - unit
-      - integration-redshift-py27:
-          requires:
-            - integration-postgres-py27
-      - integration-bigquery-py27:
-          requires:
-            - integration-postgres-py27
-      - integration-snowflake-py27:
-          requires:
-            - integration-postgres-py27
       - integration-redshift-py36:
           requires:
             - integration-postgres-py36
@@ -127,3 +177,42 @@ workflows:
       - integration-snowflake-py36:
           requires:
             - integration-postgres-py36
+      - integration-postgres-py38:
+          requires:
+            - unit
+      - integration-redshift-py38:
+          requires:
+            - integration-postgres-py38
+      - integration-bigquery-py38:
+          requires:
+            - integration-postgres-py38
+      - integration-snowflake-py38:
+          requires:
+            - integration-postgres-py38
+      - integration-postgres-py39:
+          requires:
+            - unit
+      - integration-redshift-py39:
+          requires:
+            - integration-postgres-py39
+      - integration-bigquery-py39:
+          requires:
+            - integration-postgres-py39
+      # - integration-snowflake-py39:
+      #     requires:
+      #       - integration-postgres-py39
+      - build-wheels:
+          requires:
+            - unit
+            - integration-postgres-py36
+            - integration-redshift-py36
+            - integration-bigquery-py36
+            - integration-snowflake-py36
+            - integration-postgres-py38
+            - integration-redshift-py38
+            - integration-bigquery-py38
+            - integration-snowflake-py38
+            - integration-postgres-py39
+            - integration-redshift-py39
+            - integration-bigquery-py39
+            # - integration-snowflake-py39

.dockerignore

@@ -1 +1,3 @@
 *
+!docker/requirements/*.txt
+!dist

.github/ISSUE_TEMPLATE.md

@@ -1,34 +0,0 @@
-Please make sure to fill out either the issue template or the feature template and delete the other one!
-
-## Issue
-
-### Issue description
-In general terms, please describe the issue. What command did you run?
-
-### Results
-What happened? What did you expect to happen?
-
-### System information
-The output of `dbt --version`:
-```
-<output goes here>
-```
-
-The operating system you're running on:
-
-The python version you're using (probably the output of `python --version`)
-
-### Steps to reproduce
-In as much detail as possible, please provide steps to reproduce the issue. Sample data that triggers the issue, example models, etc are all very helpful here.
-
-
-
-
-
-## Feature
-
-### Feature description
-Please describe the feature you would like dbt to have. Please provide any details, relevant documentation links, StackOverflow links, etc 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.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+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/feature_request.md

@@ -0,0 +1,23 @@
+---
+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/pull_request_template.md

@@ -0,0 +1,22 @@
+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 -->
+
+
+### 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.

.gitignore

@@ -8,7 +8,8 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
+env*/
+dbt_env/
 build/
 develop-eggs/
 dist/
@@ -23,6 +24,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+*.mypy_cache/
 logs/
 
 # PyInstaller
@@ -41,12 +43,16 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
+.env
 nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
 test.env
 
+# Mypy
+.mypy_cache/
+
 # Translations
 *.mo
 *.pot
@@ -76,3 +82,14 @@ target/
 
 # Vim
 *.sw*
+
+# pycharm
+.idea/
+
+# AWS credentials
+.aws/
+
+.DS_Store
+
+# vscode
+.vscode/

CONTRIBUTING.md

@@ -1,21 +1,80 @@
-# Getting started with dbt
+# Contributing to dbt
+
+1. [About this document](#about-this-document)
+2. [Proposing a change](#proposing-a-change)
+3. [Getting the code](#getting-the-code)
+4. [Setting up an environment](#setting-up-an-environment)
+5. [Running dbt in development](#running-dbt-in-development)
+6. [Testing](#testing)
+7. [Submitting a Pull Request](#submitting-a-pull-request)
 
 ## About this document
 
-This document is a guide intended for folks interested in contributing to dbt. It is not intended as a guide for end users of dbt (though if it is helpful, that's great!) and it assumes a certain level of familiarity with Python concepts such as virtualenvs, `pip`, python modules, filesystems, and so on. It also assumes you are using macOS or Linux and are comfortable with the command line. If you get stuck while reading this guide, drop us a line in the #development channel on [slack](slack.getdbt.com).
+This document is a guide intended for folks interested in contributing to dbt. Below, we document the process by which members of the community should create issues and submit pull requests (PRs) in this repository. It is not intended as a guide for using dbt, and it assumes a certain level of familiarity with Python concepts such as virtualenvs, `pip`, python modules, filesystems, and so on. This guide assumes you are using macOS or Linux and are comfortable with the command line.
+
+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 #development channel on [slack](community.getdbt.com).
+
+### 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.
+
+## Proposing a change
+
+dbt is Apache 2.0-licensed open source software. dbt is what it is today because community members like you have opened issues, provided feedback, and contributed to the knowledge loop for the entire communtiy. Whether you are a seasoned open source contributor or a first-time committer, we welcome and encourage you to contribute code, documentation, ideas, or problem statements to this project.
+
+### 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/fishtown-analytics/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.
+
+**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.
+
+### Discussing the idea
+
+After you open an issue, a dbt maintainer will follow up by commenting on your issue (usually within 1-3 days) to explore your idea further and advise on how to implement the suggested changes. In many cases, community members will chime in with their own thoughts on the problem statement. If you as the issue creator are interested in submitting a Pull Request to address the issue, you should indicate this in the body of the issue. The dbt maintainers are _always_ happy to help contributors with the implementation of fixes and features, so please also indicate if there's anything you're unsure about or could use guidance around in the issue.
+
+### Submitting a change
+
+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/fishtown-analytics/dbt/contribute) page.
+
+Here's a good workflow:
+- Comment on the open issue, expressing your interest in contributing the required code change
+- Outline your planned implementation. If you want help getting started, ask!
+- Follow the steps outlined below to develop locally. Once you have opened a PR, one of the dbt maintainers will work with you to review your code.
+- Add a test! Tests are crucial for both fixes and new features alike. We want to make sure that code works as intended, and that it avoids any bugs  previously encountered. Currently, the best resource for understanding dbt's [unit](test/unit) and [integration](test/integration) tests is the tests themselves. One of the maintainers can help by pointing out relevant examples.
+
+In some cases, the right resolution to an open issue might be tangential to the dbt codebase. The right path forward might be a documentation update or a change that can be made in user-space. In other cases, the issue might describe functionality that the dbt maintainers are unwilling or unable to incorporate into the dbt codebase. When it is determined that an open issue describes functionality that will not translate to a code change in the dbt repository, the issue will be tagged with the `wontfix` label (see below) and closed.
+
+### Using issue labels
+
+The dbt maintainers use labels to categorize open issues. Some labels indicate the databases impacted by the issue, while others describe the domain in the dbt codebase germane to the discussion. While most of these labels are self-explanatory (eg. `snowflake` or `bigquery`), there are others that are worth describing.
+
+| tag | description |
+| --- | ----------- |
+| [triage](https://github.com/fishtown-analytics/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/fishtown-analytics/dbt/labels/bug) | This issue represents a defect or regression in dbt |
+| [enhancement](https://github.com/fishtown-analytics/dbt/labels/enhancement) | This issue represents net-new functionality in dbt |
+| [good first issue](https://github.com/fishtown-analytics/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/fishtown-analytics/dbt/labels/help%20wanted) / [discussion](https://github.com/fishtown-analytics/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/fishtown-analytics/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/fishtown-analytics/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/fishtown-analytics/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/fishtown-analytics/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. |
+
 
 ## Getting the code
 
 ### Installing git
 
-You will need `git` in order to download and modify the dbt source code. On macOS, the best way to download git is to just install Xcode.
+You will need `git` in order to download and modify the dbt source code. On macOS, the best way to download git is to just install [Xcode](https://developer.apple.com/support/xcode/).
 
 ### External contributors
 
 If you are not a member of the `fishtown-analytics` GitHub organization, you can contribute to dbt by forking the dbt repository. For a detailed overview on forking, check out the [GitHub docs on forking](https://help.github.com/en/articles/fork-a-repo). In short, you will need to:
 
 1. fork the dbt repository
-2. clone your fork
+2. clone your fork locally
 3. check out a new branch for your proposed changes
 4. push changes to your fork
 5. open a pull request against `fishtown-analytics/dbt` from your forked repository
@@ -23,58 +82,12 @@ If you are not a member of the `fishtown-analytics` GitHub organization, you can
 ### Core contributors
 
 If you are a member of the `fishtown-analytics` GitHub organization, you will have push access to the dbt repo. Rather than 
-forking dbt to make your changes, just clone the repository and push directly to a branch.
+forking dbt to make your changes, just clone the repository, check out a new branch, and push directly to that branch.
 
 
 ## Setting up an environment
 
-To begin developing code in dbt, you should set up the following:
-
-### virtualenv
-
-We strongly recommend using virtual environments when developing code in dbt. We recommend creating this virtualenv
-in the root of the dbt repository. To create a new virtualenv, run:
-```
-python3 -m venv env
-source env/bin/activate
-```
-
-This will create and activate a new Python virtual environment.
-
-### docker and docker-compose
-
-Docker and docker-compose are both used in testing. For macOS, the easiest thing to do is to [download docker for mac](https://store.docker.com/editions/community/docker-ce-desktop-mac). You'll need to make an account. On Linux, you can use one of the packages [here](https://docs.docker.com/install/#server). We recommend installing from docker.com instead of from your package manager. On Linux you also have to install docker-compose separately, follow [these instructions](https://docs.docker.com/compose/install/#install-compose).
-
-
-### Installing postgres locally (optional)
-
-For testing, and later in the examples in this document, you may want to have `psql` available so you can poke around in the database and see what happened. We recommend that you use [homebrew](https://brew.sh/) for that on macOS, and your package manager on Linux. You can install any version of the postgres client that you'd like. On macOS, with homebrew setup, you can run:
-
-```
-brew install postgresql
-```
-
-## Running dbt in development
-
-### Installation
-
-First make sure that you set up your `virtualenv` as described in section _Setting up an environment_. Next, install dbt (and it's dependencies) with:
-
-```
-pip install -r requirements.txt
-```
-
-When dbt is installed from source in this way, any changes you make to the dbt source code will be reflected immediately in your next `dbt` run.
-
-### Running dbt
-
-With your virtualenv activated, the `dbt` script should point back to the source code you've cloned on your machine. You can verify this by running `which dbt`. This command should show you a path to an executable in your virtualenv.
-
-Configure your [profile](https://docs.getdbt.com/docs/configure-your-profile) as necessary to connect to your target databases. It may be a good idea to add a new profile pointing to a local postgres instance, or a specific test sandbox within your data warehouse if appropriate.
-
-## Testing
-
-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.
+There are some tools that will be helpful to you in developing locally. While this is the list relevant for dbt development, many of these tools are used commonly across open-source python projects.
 
 ### Tools
 
@@ -89,13 +102,58 @@ A short list of tools used in dbt testing that will be helpful to your understan
 
 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.
 
+#### virtual environments
+
+We strongly recommend using virtual environments when developing code in dbt. We recommend creating this virtualenv
+in the root of the dbt repository. To create a new virtualenv, run:
+```
+python3 -m venv env
+source env/bin/activate
+```
+
+This will create and activate a new Python virtual environment.
+
+#### docker and docker-compose
+
+Docker and docker-compose are both used in testing. For macOS, the easiest thing to do is to [download docker for mac](https://store.docker.com/editions/community/docker-ce-desktop-mac). You'll need to make an account. On Linux, you can use one of the packages [here](https://docs.docker.com/install/#server). We recommend installing from docker.com instead of from your package manager. On Linux you also have to install docker-compose separately, following [these instructions](https://docs.docker.com/compose/install/#install-compose).
+
+
+#### postgres (optional)
+
+For testing, and later in the examples in this document, you may want to have `psql` available so you can poke around in the database and see what happened. We recommend that you use [homebrew](https://brew.sh/) for that on macOS, and your package manager on Linux. You can install any version of the postgres client that you'd like. On macOS, with homebrew setup, you can run:
+
+```
+brew install postgresql
+```
+
+## Running dbt in development
+
+### Installation
+
+First make sure that you set up your `virtualenv` as described in section _Setting up an environment_. Next, install dbt (and its dependencies) with:
+
+```
+pip install -r editable_requirements.txt
+```
+
+When dbt is installed from source in this way, any changes you make to the dbt source code will be reflected immediately in your next `dbt` run.
+
+### Running dbt
+
+With your virtualenv activated, the `dbt` script should point back to the source code you've cloned on your machine. You can verify this by running `which dbt`. This command should show you a path to an executable in your virtualenv.
+
+Configure your [profile](https://docs.getdbt.com/docs/configure-your-profile) as necessary to connect to your target databases. It may be a good idea to add a new profile pointing to a local postgres instance, or a specific test sandbox within your data warehouse if appropriate.
+
+## Testing
+
+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.
 
 ### Running tests via Docker
 
-dbt's unit and integration tests run in Docker. Because 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, Fishtown Analytics provides a CI environment with access to sandboxed Redshift, Snowflake, BigQuery, and Postgres databases. See the section on _Submitting a Pull Request_ below for more information on this CI setup.
+dbt's unit and integration tests run in Docker. Because 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, Fishtown Analytics 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.
 
 
-#### Specifying your test credentials
+### Specifying your test credentials
 
 dbt uses test credentials specified in a `test.env` file in the root of the repository. 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:
 
@@ -104,9 +162,11 @@ cp test.env.sample test.env
 atom test.env # supply your credentials
 ```
 
-We recommend starting with dbt's Postgres tests. These tests cover most of the functionality in dbt, are the fastest to run, and are the easiest to set up. dbt's test suite runs Postgres in a Docker container, so no setup should be required to run these tests. If you additionally want to test Snowflake, Bigquery, or Redshift locally you'll need to get credentials and add them to the `test.env` file. 
+We recommend starting with dbt's Postgres tests. These tests cover most of the functionality in dbt, are the fastest to run, and are the easiest to set up. dbt's test suite runs Postgres in a Docker container, so no setup should be required to run these tests.
 
-#### Running tests
+If you additionally want to test Snowflake, Bigquery, or Redshift, locally you'll need to get credentials and add them to the `test.env` file. In general, it's most important to have successful unit and Postgres tests. Once you open a PR, dbt will automatically run integration tests for the other three core database adapters. Of course, if you are a BigQuery user, contributing a BigQuery-only feature, it's important to run BigQuery tests as well.
+
+### Test commands
 
 dbt's unit tests and Python linter can be run with:
 
@@ -142,14 +202,21 @@ docker-compose run test tox -e integration-bigquery-py36 -- -x
 docker-compose run test tox -e integration-redshift-py36 -- -x
 ```
 
+To run a specific test by itself:
+```
+docker-compose run test tox -e explicit-py36 -- -s -x -m profile_{adapter} {path_to_test_file_or_folder}
+```
+E.g.
+```
+docker-compose run test tox -e explicit-py36 -- -s -x -m profile_snowflake test/integration/001_simple_copy_test
+```
+
 See the `Makefile` contents for more some other examples of ways to run `tox`.
 
-### Submitting a Pull Request
+## Submitting a Pull Request
 
-Fishtown Analytics provides a sandboxed Redshift, Snowflake, and BigQuery database for use in a CI environment.
+Fishtown Analytics provides a sandboxed Redshift, Snowflake, and BigQuery database for use in a CI environment. When pull requests are submitted to the `fishtown-analytics/dbt` repo, GitHub will trigger automated tests in CircleCI and Azure Pipelines.
 
-When pull requests are submitted to the `fishtown-analytics/dbt` repo, GitHub will trigger automated tests in CircleCI and Azure Pipelines. If the PR submitter is a member of the `fishtown-analytics` GitHub organization, then the credentials for these databases will be automatically supplied as environment variables in the CI test suite.
+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.
 
-**If the PR submitter is not a member of the `fishtown-analytics` organization, then these environment variables will not be automatically supplied in the CI environment**. Once a core maintainer has taken a look at the Pull Request, they will kick off the test suite with the required credentials.
-
-Once your tests are passing and your PR has been reviewed, a dbt maintainer will merge your changes into the active development branch! And that's it! Happy developing :tada:
+Once all tests are passing and your PR has been approved, a dbt maintainer will merge your changes into the active development branch. And that's it! Happy developing :tada:

Dockerfile

@@ -1,53 +0,0 @@
-FROM ubuntu:18.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get update && \
-    apt-get install -y  --no-install-recommends \
-        netcat postgresql make build-essential libssl-dev zlib1g-dev \
-        libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev \
-        xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev git ca-certificates \
-        curl git ssh && \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-RUN useradd -mU dbt_test_user
-RUN mkdir /usr/app && chown dbt_test_user /usr/app
-RUN mkdir /home/tox && chown dbt_test_user /home/tox
-USER dbt_test_user
-
-WORKDIR /usr/app
-VOLUME /usr/app
-
-RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
-
-ENV PYENV_ROOT="/home/dbt_test_user/.pyenv" \
-    PATH="/home/dbt_test_user/.pyenv/bin:/home/dbt_test_user/.pyenv/shims:$PATH"
-
-RUN pyenv update && \
-    echo "2.7.16 3.6.8 3.7.3" | xargs -P 4 -n 1 pyenv install && \
-    pyenv global $(pyenv versions --bare)
-
-RUN pyenv virtualenv 3.6.8 dbt36 && \
-    pyenv virtualenv 3.7.3 dbt37 && \
-    pyenv virtualenv 2.7.16 dbt27
-
-RUN cd /usr/app && \
-    python -m pip install -U pip && \
-    python -m pip install tox && \
-    pyenv local dbt37 && \
-    python -m pip install -U pip && \
-    python -m pip install tox && \
-    pyenv local --unset && \
-    pyenv local dbt36 && \
-    python -m pip install -U pip && \
-    python -m pip install tox && \
-    pyenv local --unset && \
-    pyenv local dbt27 && \
-    python -m pip install -U pip && \
-    python -m pip install tox && \
-    pyenv local --unset && \
-    pyenv rehash
-
-RUN pyenv local dbt36 dbt37 dbt27
-
-ENV PYTHONIOENCODING=utf-8

Dockerfile.test

@@ -0,0 +1,74 @@
+FROM ubuntu:18.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update \
+    && apt-get dist-upgrade -y \
+    && apt-get install -y --no-install-recommends \
+    netcat \
+    postgresql \
+    curl \
+    git \
+    ssh \
+    software-properties-common \
+    make \
+    build-essential \
+    ca-certificates \
+    libpq-dev \
+    libsasl2-dev \
+    libsasl2-2 \
+    libsasl2-modules-gssapi-mit \
+    libyaml-dev \
+    unixodbc-dev \
+    && add-apt-repository ppa:deadsnakes/ppa \
+    && apt-get install -y \
+    python \
+    python-dev \
+    python-pip \
+    python3.6 \
+    python3.6-dev \
+    python3-pip \
+    python3.6-venv \
+    python3.7 \
+    python3.7-dev \
+    python3.7-venv \
+    python3.8 \
+    python3.8-dev \
+    python3.8-venv \
+    python3.9 \
+    python3.9-dev \
+    python3.9-venv \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+ARG DOCKERIZE_VERSION=v0.6.1
+RUN curl -LO https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+RUN pip3 install -U "tox==3.14.4" wheel "six>=1.14.0,<1.15.0" "virtualenv==20.0.3" setuptools
+# tox fails if the 'python' interpreter (python2) doesn't have `tox` installed
+RUN pip install -U "tox==3.14.4" "six>=1.14.0,<1.15.0" "virtualenv==20.0.3" setuptools
+
+# These args are passed in via docker-compose, which reads then from the .env file.
+# On Linux, run `make .env` to create the .env file for the current user.
+# On MacOS and Windows, these can stay unset.
+ARG USER_ID
+ARG GROUP_ID
+
+RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
+    groupadd -g ${GROUP_ID} dbt_test_user && \
+    useradd -m -l -u ${USER_ID} -g ${GROUP_ID} dbt_test_user; \
+    else \
+    useradd -mU -l dbt_test_user; \
+    fi
+RUN mkdir /usr/app && chown dbt_test_user /usr/app
+RUN mkdir /home/tox && chown dbt_test_user /home/tox
+
+WORKDIR /usr/app
+VOLUME /usr/app
+
+USER dbt_test_user
+
+ENV PYTHONIOENCODING=utf-8
+ENV LANG C.UTF-8

Makefile

@@ -5,25 +5,38 @@ changed_tests := `git status --porcelain | grep '^\(M\| M\|A\| A\)' | awk '{ pri
 install:
 	pip install -e .
 
-test:
+test: .env
 	@echo "Full test run starting..."
-	@time docker-compose run test tox
+	@time docker-compose run --rm test tox
 
-test-unit:
+test-unit: .env
 	@echo "Unit test run starting..."
-	@time docker-compose run test tox -e unit-py27,unit-py36,flake8
+	@time docker-compose run --rm test tox -e unit-py36,flake8
 
-test-integration:
+test-integration: .env
 	@echo "Integration test run starting..."
-	@time docker-compose run test tox -e integration-postgres-py27,integration-postgres-py36,integration-redshift-py27,integration-redshift-py36,integration-snowflake-py27,integration-snowflake-py36,integration-bigquery-py27,integration-bigquery-py36
+	@time docker-compose run --rm test tox -e integration-postgres-py36,integration-redshift-py36,integration-snowflake-py36,integration-bigquery-py36
 
-test-quick:
+test-quick: .env
 	@echo "Integration test run starting..."
-	@time docker-compose run test tox -e integration-postgres-py36 -- -x
+	@time docker-compose run --rm test tox -e integration-postgres-py36 -- -x
+
+# This rule creates a file named .env that is used by docker-compose for passing
+# the USER_ID and GROUP_ID arguments to the Docker image.
+.env:
+	@touch .env
+ifneq ($(OS),Windows_NT)
+ifneq ($(shell uname -s), Darwin)
+	@echo USER_ID=$(shell id -u) > .env
+	@echo GROUP_ID=$(shell id -g) >> .env
+endif
+endif
+	@time docker-compose build
 
 clean:
 	rm -f .coverage
 	rm -rf .eggs/
+	rm -f .env
 	rm -rf .tox/
 	rm -rf build/
 	rm -rf dbt.egg-info/

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://github.com/fishtown-analytics/dbt/blob/master/etc/dbt-horizontal.png?raw=true" alt="dbt logo"/>
+  <img src="/etc/dbt-logo-full.svg" alt="dbt logo" width="500"/>
 </p>
 <p align="center">
   <a href="https://codeclimate.com/github/fishtown-analytics/dbt">
@@ -11,8 +11,8 @@
   <a href="https://ci.appveyor.com/project/DrewBanin/dbt/branch/development">
     <img src="https://ci.appveyor.com/api/projects/status/v01rwd3q91jnwp9m/branch/development?svg=true" alt="AppVeyor" />
   </a>
-  <a href="https://slack.getdbt.com">
-    <img src="https://slack.getdbt.com/badge.svg" alt="Slack" />
+  <a href="https://community.getdbt.com">
+    <img src="https://community.getdbt.com/badge.svg" alt="Slack" />
   </a>
 </p>
 
@@ -40,19 +40,19 @@ These select statements, or "models", form a dbt project. Models frequently buil
 
 ## Find out more
 
--   Check out the [Introduction to dbt](https://dbt.readme.io/docs/introduction).
--   Read the [dbt Viewpoint](https://dbt.readme.io/docs/viewpoint).
+-   Check out the [Introduction to dbt](https://docs.getdbt.com/docs/introduction/).
+-   Read the [dbt Viewpoint](https://docs.getdbt.com/docs/about/viewpoint/).
 
 ## Join thousands of analysts in the dbt community
 
--   Join the [chat](http://slack.getdbt.com/) on Slack.
+-   Join the [chat](http://community.getdbt.com/) on Slack.
 -   Find community posts on [dbt 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://slack.getdbt.com/), or open [an issue](https://github.com/fishtown-analytics/dbt/issues/new).
+-   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/fishtown-analytics/dbt/issues/new).
 -   Want to help us build dbt? Check out the [Contributing Getting Started Guide](/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 [PyPA Code of Conduct](https://www.pypa.io/en/latest/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).

RELEASE.md

@@ -14,10 +14,10 @@ dbt has three types of branches:
 2. If this is a release candidate, you want to create it off of your release branch. If it's an actual release, you must first merge to a master branch. Open a Pull Request in Github to merge it into the appropriate trunk (`X.X.latest`)
 3. Bump the version using `bumpversion`:
   - Dry run first by running `bumpversion --new-version <desired-version> <part>` and checking the diff. If it looks correct, clean up the chanages and move on:
-  - Alpha releases: `bumpversion --commit --tag --new-version 0.10.2a1 num`
-  - Patch releases: `bumpversion --commit --tag --new-version 0.10.2 patch`
-  - Minor releases: `bumpversion --commit --tag --new-version 0.11.0 minor`
-  - Major releases: `bumpversion --commit --tag --new-version 1.0.0 major`
+  - Alpha releases: `bumpversion --commit --no-tag --new-version 0.10.2a1 num`
+  - Patch releases: `bumpversion --commit --no-tag --new-version 0.10.2 patch`
+  - Minor releases: `bumpversion --commit --no-tag --new-version 0.11.0 minor`
+  - Major releases: `bumpversion --commit --no-tag --new-version 1.0.0 major`
 4. (If this is a not a release candidate) Merge to `x.x.latest` and (optionally) `master`.
 5. Update the default branch to the next dev release branch.
 6. Build source distributions for all packages by running `./scripts/build-sdists.sh`. Note that this will clean out your `dist/` folder, so if you have important stuff in there, don't run it!!!

azure-pipelines.yml

@@ -17,7 +17,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.5'
+      versionSpec: '3.7'
       architecture: 'x64'
 
   - script: python -m pip install --upgrade pip && pip install tox
@@ -33,24 +33,22 @@ jobs:
 
   steps:
   - pwsh: |
-      choco install postgresql --params '/Password:password' --params-global --version 10.6
-      Set-Content "c:\program files\postgresql\10\data\pg_hba.conf" "host   all   all   ::1/128        trust"
-      Add-Content "c:\program files\postgresql\10\data\pg_hba.conf" "host   all   all   127.0.0.1/32   trust"
-      # the service name is "postgresql-x64-10", conveniently it's both the display name and the actual name
-      Restart-Service postgresql-x64-10
+      $serviceName = Get-Service -Name postgresql*
+      Set-Service -InputObject $serviceName -StartupType Automatic
+      Start-Service -InputObject $serviceName
 
-      & "C:\program files\postgresql\10\bin\createdb.exe" -U postgres dbt
-      & "C:\program files\postgresql\10\bin\psql.exe"  -U postgres -c "CREATE ROLE root WITH PASSWORD 'password';"
-      & "C:\program files\postgresql\10\bin\psql.exe"  -U postgres -c "ALTER ROLE root WITH LOGIN;"
-      & "C:\program files\postgresql\10\bin\psql.exe"  -U postgres -c "GRANT CREATE, CONNECT ON DATABASE dbt TO root WITH GRANT OPTION;"
-      & "C:\program files\postgresql\10\bin\psql.exe"  -U postgres -c "CREATE ROLE noaccess WITH PASSWORD 'password' NOSUPERUSER;"
-      & "C:\program files\postgresql\10\bin\psql.exe"  -U postgres -c "ALTER ROLE noaccess WITH LOGIN;"
-      & "C:\program files\postgresql\10\bin\psql.exe"  -U postgres -c "GRANT CONNECT ON DATABASE dbt TO noaccess;"
+      & $env:PGBIN\createdb.exe -U postgres dbt
+      & $env:PGBIN\psql.exe  -U postgres -c "CREATE ROLE root WITH PASSWORD 'password';"
+      & $env:PGBIN\psql.exe  -U postgres -c "ALTER ROLE root WITH LOGIN;"
+      & $env:PGBIN\psql.exe  -U postgres -c "GRANT CREATE, CONNECT ON DATABASE dbt TO root WITH GRANT OPTION;"
+      & $env:PGBIN\psql.exe  -U postgres -c "CREATE ROLE noaccess WITH PASSWORD 'password' NOSUPERUSER;"
+      & $env:PGBIN\psql.exe  -U postgres -c "ALTER ROLE noaccess WITH LOGIN;"
+      & $env:PGBIN\psql.exe  -U postgres -c "GRANT CONNECT ON DATABASE dbt TO noaccess;"
     displayName: Install postgresql and set up database
 
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.5'
+      versionSpec: '3.7'
       architecture: 'x64'
 
   - script: python -m pip install --upgrade pip && pip install tox
@@ -65,11 +63,11 @@ jobs:
   pool:
     vmImage: 'vs2017-win2016'
   dependsOn: PostgresIntegrationTest
-
+  condition: succeeded()
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.5'
+      versionSpec: '3.7'
       architecture: 'x64'
 
   - script: python -m pip install --upgrade pip && pip install tox
@@ -81,19 +79,21 @@ jobs:
       SNOWFLAKE_TEST_PASSWORD: $(SNOWFLAKE_TEST_PASSWORD)
       SNOWFLAKE_TEST_USER: $(SNOWFLAKE_TEST_USER)
       SNOWFLAKE_TEST_WAREHOUSE: $(SNOWFLAKE_TEST_WAREHOUSE)
+      SNOWFLAKE_TEST_OAUTH_REFRESH_TOKEN: $(SNOWFLAKE_TEST_OAUTH_REFRESH_TOKEN)
+      SNOWFLAKE_TEST_OAUTH_CLIENT_ID: $(SNOWFLAKE_TEST_OAUTH_CLIENT_ID)
+      SNOWFLAKE_TEST_OAUTH_CLIENT_SECRET: $(SNOWFLAKE_TEST_OAUTH_CLIENT_SECRET)
     displayName: Run integration tests
 
 - job: BigQueryIntegrationTest
   pool:
     vmImage: 'vs2017-win2016'
   dependsOn: PostgresIntegrationTest
-
+  condition: succeeded()
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.5'
+      versionSpec: '3.7'
       architecture: 'x64'
-
   - script: python -m pip install --upgrade pip && pip install tox
     displayName: 'Install dependencies'
   - script: python -m tox -e pywin-bigquery
@@ -105,11 +105,11 @@ jobs:
   pool:
     vmImage: 'vs2017-win2016'
   dependsOn: PostgresIntegrationTest
-
+  condition: succeeded()
   steps:
   - task: UsePythonVersion@0
     inputs:
-      versionSpec: '3.5'
+      versionSpec: '3.7'
       architecture: 'x64'
 
   - script: python -m pip install --upgrade pip && pip install tox
@@ -123,3 +123,32 @@ jobs:
       REDSHIFT_TEST_PORT: $(REDSHIFT_TEST_PORT)
       REDSHIFT_TEST_HOST: $(REDSHIFT_TEST_HOST)
     displayName: Run integration tests
+
+- job: BuildWheel
+  pool:
+    vmImage: 'vs2017-win2016'
+  dependsOn:
+    - UnitTest
+    - PostgresIntegrationTest
+    - RedshiftIntegrationTest
+    - SnowflakeIntegrationTest
+    - BigQueryIntegrationTest
+  condition: succeeded()
+  steps:
+    - task: UsePythonVersion@0
+      inputs:
+        versionSpec: '3.7'
+        architecture: 'x64'
+    - script: python -m pip install --upgrade pip setuptools && python -m pip install -r requirements.txt && python -m pip install -r dev_requirements.txt
+      displayName: Install dependencies
+    - task: ShellScript@2
+      inputs:
+        scriptPath: scripts/build-wheels.sh
+    - task: CopyFiles@2
+      inputs:
+        contents: 'dist\?(*.whl|*.tar.gz)'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)'
+    - task: PublishBuildArtifacts@1
+      inputs:
+        pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+        artifactName: dists

core/dbt/__init__.py

@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)

core/dbt/adapters/__init__.py

@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)

core/dbt/adapters/base/__init__.py

@@ -1,8 +1,14 @@
 # these are all just exports, #noqa them so flake8 will be happy
+
+# TODO: Should we still include this in the `adapters` namespace?
+from dbt.contracts.connection import Credentials  # noqa
 from dbt.adapters.base.meta import available  # noqa
-from dbt.adapters.base.relation import BaseRelation  # noqa
-from dbt.adapters.base.relation import Column  # noqa
 from dbt.adapters.base.connections import BaseConnectionManager  # noqa
-from dbt.adapters.base.connections import Credentials  # noqa
-from dbt.adapters.base.impl import BaseAdapter  # noqa
+from dbt.adapters.base.relation import (  # noqa
+    BaseRelation,
+    RelationType,
+    SchemaSearchMap,
+)
+from dbt.adapters.base.column import Column  # noqa
+from dbt.adapters.base.impl import AdapterConfig, BaseAdapter  # noqa
 from dbt.adapters.base.plugin import AdapterPlugin  # noqa

core/dbt/adapters/base/column.py

@@ -0,0 +1,155 @@
+from dataclasses import dataclass
+import re
+
+from hologram import JsonSchemaMixin
+from dbt.exceptions import RuntimeException
+
+from typing import Dict, ClassVar, Any, Optional
+
+
+@dataclass
+class Column(JsonSchemaMixin):
+    TYPE_LABELS: ClassVar[Dict[str, str]] = {
+        'STRING': 'TEXT',
+        'TIMESTAMP': 'TIMESTAMP',
+        'FLOAT': 'FLOAT',
+        'INTEGER': 'INT'
+    }
+    column: str
+    dtype: str
+    char_size: Optional[int] = None
+    numeric_precision: Optional[Any] = None
+    numeric_scale: Optional[Any] = None
+
+    @classmethod
+    def translate_type(cls, dtype: str) -> str:
+        return cls.TYPE_LABELS.get(dtype.upper(), dtype)
+
+    @classmethod
+    def create(cls, name, label_or_dtype: str) -> 'Column':
+        column_type = cls.translate_type(label_or_dtype)
+        return cls(name, column_type)
+
+    @property
+    def name(self) -> str:
+        return self.column
+
+    @property
+    def quoted(self) -> str:
+        return '"{}"'.format(self.column)
+
+    @property
+    def data_type(self) -> str:
+        if self.is_string():
+            return Column.string_type(self.string_size())
+        elif self.is_numeric():
+            return Column.numeric_type(self.dtype, self.numeric_precision,
+                                       self.numeric_scale)
+        else:
+            return self.dtype
+
+    def is_string(self) -> bool:
+        return self.dtype.lower() in ['text', 'character varying', 'character',
+                                      'varchar']
+
+    def is_number(self):
+        return any([self.is_integer(), self.is_numeric(), self.is_float()])
+
+    def is_float(self):
+        return self.dtype.lower() in [
+            # floats
+            'real', 'float4', 'float', 'double precision', 'float8'
+        ]
+
+    def is_integer(self) -> bool:
+        return self.dtype.lower() in [
+            # real types
+            'smallint', 'integer', 'bigint',
+            'smallserial', 'serial', 'bigserial',
+            # aliases
+            'int2', 'int4', 'int8',
+            'serial2', 'serial4', 'serial8',
+        ]
+
+    def is_numeric(self) -> bool:
+        return self.dtype.lower() in ['numeric', 'decimal']
+
+    def string_size(self) -> int:
+        if not self.is_string():
+            raise RuntimeException("Called string_size() on non-string field!")
+
+        if self.dtype == 'text' or self.char_size is None:
+            # char_size should never be None. Handle it reasonably just in case
+            return 256
+        else:
+            return int(self.char_size)
+
+    def can_expand_to(self, other_column: 'Column') -> bool:
+        """returns True if this column can be expanded to the size of the
+        other column"""
+        if not self.is_string() or not other_column.is_string():
+            return False
+
+        return other_column.string_size() > self.string_size()
+
+    def literal(self, value: Any) -> str:
+        return "{}::{}".format(value, self.data_type)
+
+    @classmethod
+    def string_type(cls, size: int) -> str:
+        return "character varying({})".format(size)
+
+    @classmethod
+    def numeric_type(cls, dtype: str, precision: Any, scale: Any) -> str:
+        # This could be decimal(...), numeric(...), number(...)
+        # Just use whatever was fed in here -- don't try to get too clever
+        if precision is None or scale is None:
+            return dtype
+        else:
+            return "{}({},{})".format(dtype, precision, scale)
+
+    def __repr__(self) -> str:
+        return "<Column {} ({})>".format(self.name, self.data_type)
+
+    @classmethod
+    def from_description(cls, name: str, raw_data_type: str) -> 'Column':
+        match = re.match(r'([^(]+)(\([^)]+\))?', raw_data_type)
+        if match is None:
+            raise RuntimeException(
+                f'Could not interpret data type "{raw_data_type}"'
+            )
+        data_type, size_info = match.groups()
+        char_size = None
+        numeric_precision = None
+        numeric_scale = None
+        if size_info is not None:
+            # strip out the parentheses
+            size_info = size_info[1:-1]
+            parts = size_info.split(',')
+            if len(parts) == 1:
+                try:
+                    char_size = int(parts[0])
+                except ValueError:
+                    raise RuntimeException(
+                        f'Could not interpret data_type "{raw_data_type}": '
+                        f'could not convert "{parts[0]}" to an integer'
+                    )
+            elif len(parts) == 2:
+                try:
+                    numeric_precision = int(parts[0])
+                except ValueError:
+                    raise RuntimeException(
+                        f'Could not interpret data_type "{raw_data_type}": '
+                        f'could not convert "{parts[0]}" to an integer'
+                    )
+                try:
+                    numeric_scale = int(parts[1])
+                except ValueError:
+                    raise RuntimeException(
+                        f'Could not interpret data_type "{raw_data_type}": '
+                        f'could not convert "{parts[1]}" to an integer'
+                    )
+
+        return cls(
+            name, data_type, char_size, numeric_precision, numeric_scale
+        )

core/dbt/adapters/base/connections.py

@@ -1,71 +1,28 @@
 import abc
-import multiprocessing
 import os
+# multiprocessing.RLock is a function returning this type
+from multiprocessing.synchronize import RLock
+from threading import get_ident
+from typing import (
+    Dict, Tuple, Hashable, Optional, ContextManager, List, Union
+)
 
-import six
+import agate
 
 import dbt.exceptions
-import dbt.flags
-from dbt.api import APIObject
-from dbt.compat import abstractclassmethod, get_ident
-from dbt.contracts.connection import Connection
+from dbt.contracts.connection import (
+    Connection, Identifier, ConnectionState,
+    AdapterRequiredConfig, LazyHandle, AdapterResponse
+)
+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.utils import translate_aliases
+from dbt import flags
 
 
-class Credentials(APIObject):
-    """Common base class for credentials. This is not valid to instantiate"""
-    SCHEMA = NotImplemented
-    # map credential aliases to their canonical names.
-    ALIASES = {}
-
-    def __init__(self, **kwargs):
-        renamed = self.translate_aliases(kwargs)
-        super(Credentials, self).__init__(**renamed)
-
-    @property
-    def type(self):
-        raise NotImplementedError(
-            'type not implemented for base credentials class'
-        )
-
-    def connection_info(self):
-        """Return an ordered iterator of key/value pairs for pretty-printing.
-        """
-        for key in self._connection_keys():
-            if key in self._contents:
-                yield key, self._contents[key]
-
-    def _connection_keys(self):
-        """The credential object keys that should be printed to users in
-        'dbt debug' output. This is specific to each adapter.
-        """
-        raise NotImplementedError
-
-    def incorporate(self, **kwargs):
-        # implementation note: we have to do this here, or
-        # incorporate(alias_name=...) will result in duplicate keys in the
-        # merged dict that APIObject.incorporate() creates.
-        renamed = self.translate_aliases(kwargs)
-        return super(Credentials, self).incorporate(**renamed)
-
-    def serialize(self, with_aliases=False):
-        serialized = super(Credentials, self).serialize()
-        if with_aliases:
-            serialized.update({
-                new_name: serialized[canonical_name]
-                for new_name, canonical_name in self.ALIASES.items()
-                if canonical_name in serialized
-            })
-        return serialized
-
-    @classmethod
-    def translate_aliases(cls, kwargs):
-        return translate_aliases(kwargs, cls.ALIASES)
-
-
-@six.add_metaclass(abc.ABCMeta)
-class BaseConnectionManager(object):
+class BaseConnectionManager(metaclass=abc.ABCMeta):
     """Methods to implement:
         - exception_handler
         - cancel_open
@@ -78,41 +35,52 @@ class BaseConnectionManager(object):
     You must also set the 'TYPE' class attribute with a class-unique constant
     string.
     """
-    TYPE = NotImplemented
+    TYPE: str = NotImplemented
 
-    def __init__(self, profile):
+    def __init__(self, profile: AdapterRequiredConfig):
         self.profile = profile
-        self.thread_connections = {}
-        self.lock = multiprocessing.RLock()
+        self.thread_connections: Dict[Hashable, Connection] = {}
+        self.lock: RLock = flags.MP_CONTEXT.RLock()
+        self.query_header: Optional[MacroQueryStringSetter] = None
+
+    def set_query_header(self, manifest: Manifest) -> None:
+        self.query_header = MacroQueryStringSetter(self.profile, manifest)
 
     @staticmethod
-    def get_thread_identifier():
+    def get_thread_identifier() -> Hashable:
         # note that get_ident() may be re-used, but we should never experience
         # that within a single process
         return (os.getpid(), get_ident())
 
-    def get_thread_connection(self):
+    def get_thread_connection(self) -> Connection:
         key = self.get_thread_identifier()
         with self.lock:
             if key not in self.thread_connections:
-                raise RuntimeError(
-                    'connection never acquired for thread {}, have {}'
-                    .format(key, list(self.thread_connections))
+                raise dbt.exceptions.InvalidConnectionException(
+                    key, list(self.thread_connections)
                 )
             return self.thread_connections[key]
 
-    def get_if_exists(self):
+    def set_thread_connection(self, conn: Connection) -> None:
+        key = self.get_thread_identifier()
+        if key in self.thread_connections:
+            raise dbt.exceptions.InternalException(
+                'In set_thread_connection, existing connection exists for {}'
+            )
+        self.thread_connections[key] = conn
+
+    def get_if_exists(self) -> Optional[Connection]:
         key = self.get_thread_identifier()
         with self.lock:
             return self.thread_connections.get(key)
 
-    def clear_thread_connection(self):
+    def clear_thread_connection(self) -> None:
         key = self.get_thread_identifier()
         with self.lock:
             if key in self.thread_connections:
                 del self.thread_connections[key]
 
-    def clear_transaction(self):
+    def clear_transaction(self) -> None:
         """Clear any existing transactions."""
         conn = self.get_thread_connection()
         if conn is not None:
@@ -121,8 +89,13 @@ class BaseConnectionManager(object):
             self.begin()
             self.commit()
 
+    def rollback_if_open(self) -> None:
+        conn = self.get_if_exists()
+        if conn is not None and conn.handle and conn.transaction_open:
+            self._rollback(conn)
+
     @abc.abstractmethod
-    def exception_handler(self, sql):
+    def exception_handler(self, sql: str) -> ContextManager:
         """Create a context manager that handles exceptions caused by database
         interactions.
 
@@ -134,87 +107,86 @@ class BaseConnectionManager(object):
         raise dbt.exceptions.NotImplementedException(
             '`exception_handler` is not implemented for this adapter!')
 
-    def set_connection_name(self, name=None):
+    def set_connection_name(self, name: Optional[str] = None) -> Connection:
+        conn_name: str
         if name is None:
             # if a name isn't specified, we'll re-use a single handle
             # named 'master'
-            name = 'master'
+            conn_name = 'master'
+        else:
+            if not isinstance(name, str):
+                raise dbt.exceptions.CompilerException(
+                    f'For connection name, got {name} - not a string!'
+                )
+            assert isinstance(name, str)
+            conn_name = name
 
         conn = self.get_if_exists()
-        thread_id_key = self.get_thread_identifier()
-
         if conn is None:
             conn = Connection(
-                type=self.TYPE,
+                type=Identifier(self.TYPE),
                 name=None,
-                state='init',
+                state=ConnectionState.INIT,
                 transaction_open=False,
                 handle=None,
                 credentials=self.profile.credentials
             )
-            self.thread_connections[thread_id_key] = conn
+            self.set_thread_connection(conn)
 
-        if conn.name == name and conn.state == 'open':
+        if conn.name == conn_name and conn.state == 'open':
             return conn
 
-        logger.debug('Acquiring new {} connection "{}".'
-                     .format(self.TYPE, name))
+        logger.debug(
+            'Acquiring new {} connection "{}".'.format(self.TYPE, conn_name))
 
         if conn.state == 'open':
             logger.debug(
                 'Re-using an available connection from the pool (formerly {}).'
-                .format(conn.name))
+                .format(conn.name)
+            )
         else:
-            logger.debug('Opening a new connection, currently in state {}'
-                         .format(conn.state))
-            self.open(conn)
+            conn.handle = LazyHandle(self.open)
 
-        conn.name = name
+        conn.name = conn_name
         return conn
 
     @abc.abstractmethod
-    def cancel_open(self):
+    def cancel_open(self) -> Optional[List[str]]:
         """Cancel all open connections on the adapter. (passable)"""
         raise dbt.exceptions.NotImplementedException(
             '`cancel_open` is not implemented for this adapter!'
         )
 
-    @abstractclassmethod
-    def open(cls, connection):
-        """Open a connection on the adapter.
+    @abc.abstractclassmethod
+    def open(cls, connection: Connection) -> Connection:
+        """Open the given connection on the adapter and return it.
 
         This may mutate the given connection (in particular, its state and its
         handle).
 
         This should be thread-safe, or hold the lock if necessary. The given
         connection should not be in either in_use or available.
-
-        :param Connection connection: A connection object to open.
-        :return: A connection with a handle attached and an 'open' state.
-        :rtype: Connection
         """
         raise dbt.exceptions.NotImplementedException(
             '`open` is not implemented for this adapter!'
         )
 
-    def release(self):
+    def release(self) -> None:
         with self.lock:
             conn = self.get_if_exists()
             if conn is None:
                 return
 
         try:
-            if conn.state == 'open':
-                if conn.transaction_open is True:
-                    self._rollback(conn)
-            else:
-                self.close(conn)
+            # always close the connection. close() calls _rollback() if there
+            # is an open transaction
+            self.close(conn)
         except Exception:
             # if rollback or close failed, remove our busted connection
             self.clear_thread_connection()
             raise
 
-    def cleanup_all(self):
+    def cleanup_all(self) -> None:
         with self.lock:
             for connection in self.thread_connections.values():
                 if connection.state not in {'closed', 'init'}:
@@ -229,86 +201,97 @@ class BaseConnectionManager(object):
             self.thread_connections.clear()
 
     @abc.abstractmethod
-    def begin(self):
-        """Begin a transaction. (passable)
-
-        :param str name: The name of the connection to use.
-        """
+    def begin(self) -> None:
+        """Begin a transaction. (passable)"""
         raise dbt.exceptions.NotImplementedException(
             '`begin` is not implemented for this adapter!'
         )
 
     @abc.abstractmethod
-    def commit(self):
+    def commit(self) -> None:
         """Commit a transaction. (passable)"""
         raise dbt.exceptions.NotImplementedException(
             '`commit` is not implemented for this adapter!'
         )
 
     @classmethod
-    def _rollback_handle(cls, connection):
+    def _rollback_handle(cls, connection: Connection) -> None:
         """Perform the actual rollback operation."""
-        connection.handle.rollback()
+        try:
+            connection.handle.rollback()
+        except Exception:
+            logger.debug(
+                'Failed to rollback {}'.format(connection.name),
+                exc_info=True
+            )
 
     @classmethod
-    def _close_handle(cls, connection):
+    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('On {}: Close'.format(connection.name))
+            logger.debug(f'On {connection.name}: Close')
             connection.handle.close()
         else:
-            logger.debug('On {}: No close available on handle'
-                         .format(connection.name))
+            logger.debug(f'On {connection.name}: No close available on handle')
 
     @classmethod
-    def _rollback(cls, connection):
-        """Roll back the given connection.
-        """
-        if dbt.flags.STRICT_MODE:
-            assert isinstance(connection, Connection)
+    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(
-                'Tried to rollback transaction on connection "{}", but '
-                'it does not have one open!'.format(connection.name))
+                f'Tried to rollback transaction on connection '
+                f'"{connection.name}", but it does not have one open!'
+            )
 
-        logger.debug('On {}: ROLLBACK'.format(connection.name))
+        logger.debug(f'On {connection.name}: ROLLBACK')
         cls._rollback_handle(connection)
 
         connection.transaction_open = False
 
-        return connection
-
     @classmethod
-    def close(cls, connection):
-        if dbt.flags.STRICT_MODE:
-            assert isinstance(connection, Connection)
+    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 {'closed', 'init'}:
+        if connection.state in {ConnectionState.CLOSED, ConnectionState.INIT}:
             return connection
 
         if connection.transaction_open and connection.handle:
+            logger.debug('On {}: ROLLBACK'.format(connection.name))
             cls._rollback_handle(connection)
         connection.transaction_open = False
 
         cls._close_handle(connection)
-        connection.state = 'closed'
+        connection.state = ConnectionState.CLOSED
 
         return connection
 
-    def commit_if_has_connection(self):
-        """If the named connection exists, commit the current transaction.
-
-        :param str name: The name of the connection to use.
-        """
+    def commit_if_has_connection(self) -> None:
+        """If the named connection exists, commit the current transaction."""
         connection = self.get_if_exists()
         if connection:
             self.commit()
 
+    def _add_query_comment(self, sql: str) -> str:
+        if self.query_header is None:
+            return sql
+        return self.query_header.add(sql)
+
     @abc.abstractmethod
-    def execute(self, sql, auto_begin=False, fetch=False):
+    def execute(
+        self, sql: str, auto_begin: bool = False, fetch: bool = False
+    ) -> Tuple[Union[str, AdapterResponse], agate.Table]:
         """Execute the given SQL.
 
         :param str sql: The sql to execute.
@@ -316,7 +299,7 @@ class BaseConnectionManager(object):
             transaction, automatically begin one.
         :param bool fetch: If set, fetch results.
         :return: A tuple of the status and the results (empty if fetch=False).
-        :rtype: Tuple[str, agate.Table]
+        :rtype: Tuple[Union[str, AdapterResponse], agate.Table]
         """
         raise dbt.exceptions.NotImplementedException(
             '`execute` is not implemented for this adapter!'

core/dbt/adapters/base/meta.py

@@ -1,102 +1,111 @@
 import abc
 from functools import wraps
+from typing import Callable, Optional, Any, FrozenSet, Dict, Set
+
 from dbt.deprecations import warn, renamed_method
 
 
-def _always_none(*args, **kwargs):
-    return None
+Decorator = Callable[[Any], Callable]
 
 
-def _always_list(*args, **kwargs):
-    return None
-
-
-def available(func):
-    """A decorator to indicate that a method on the adapter will be
-    exposed to the database wrapper, and will be available at parse and run
-    time.
-    """
-    func._is_available_ = True
-    return func
-
-
-def available_deprecated(supported_name, parse_replacement=None):
-    """A decorator that marks a function as available, but also prints a
-    deprecation warning. Use like
-
-    @available_deprecated('my_new_method')
-    def my_old_method(self, arg):
-        args = compatability_shim(arg)
-        return self.my_new_method(*args)
-
-    @available_deprecated('my_new_slow_method', lambda *a, **k: (0, ''))
-    def my_old_slow_method(self, arg):
-        args = compatibility_shim(arg)
-        return self.my_new_slow_method(*args)
-
-    To make `adapter.my_old_method` available but also print out a warning on
-    use directing users to `my_new_method`.
-
-    The optional parse_replacement, if provided, will provide a parse-time
-    replacement for the actual method (see `available_parse`).
-    """
-    def wrapper(func):
-        func_name = func.__name__
-        renamed_method(func_name, supported_name)
-
-        @wraps(func)
-        def inner(*args, **kwargs):
-            warn('adapter:{}'.format(func_name))
-            return func(*args, **kwargs)
-
-        if parse_replacement:
-            available = available_parse(parse_replacement)
-        return available(inner)
-    return wrapper
-
-
-def available_parse(parse_replacement):
-    """A decorator factory to indicate that a method on the adapter will be
-    exposed to the database wrapper, and will be stubbed out at parse time with
-    the given function.
-
-    @available_parse()
-    def my_method(self, a, b):
-        if something:
-            return None
-        return big_expensive_db_query()
-
-    @available_parse(lambda *args, **args: {})
-    def my_other_method(self, a, b):
-        x = {}
-        x.update(big_expensive_db_query())
-        return x
-    """
-    def inner(func):
-        func._parse_replacement_ = parse_replacement
-        available(func)
+class _Available:
+    def __call__(self, func: Callable) -> Callable:
+        func._is_available_ = True  # type: ignore
         return func
-    return inner
+
+    def parse(self, parse_replacement: Callable) -> Decorator:
+        """A decorator factory to indicate that a method on the adapter will be
+        exposed to the database wrapper, and will be stubbed out at parse time
+        with the given function.
+
+        @available.parse()
+        def my_method(self, a, b):
+            if something:
+                return None
+            return big_expensive_db_query()
+
+        @available.parse(lambda *args, **args: {})
+        def my_other_method(self, a, b):
+            x = {}
+            x.update(big_expensive_db_query())
+            return x
+        """
+        def inner(func):
+            func._parse_replacement_ = parse_replacement
+            return self(func)
+        return inner
+
+    def deprecated(
+        self, supported_name: str, parse_replacement: Optional[Callable] = None
+    ) -> Decorator:
+        """A decorator that marks a function as available, but also prints a
+        deprecation warning. Use like
+
+        @available.deprecated('my_new_method')
+        def my_old_method(self, arg):
+            args = compatability_shim(arg)
+            return self.my_new_method(*args)
+
+        @available.deprecated('my_new_slow_method', lambda *a, **k: (0, ''))
+        def my_old_slow_method(self, arg):
+            args = compatibility_shim(arg)
+            return self.my_new_slow_method(*args)
+
+        To make `adapter.my_old_method` available but also print out a warning
+        on use directing users to `my_new_method`.
+
+        The optional parse_replacement, if provided, will provide a parse-time
+        replacement for the actual method (see `available.parse`).
+        """
+        def wrapper(func):
+            func_name = func.__name__
+            renamed_method(func_name, supported_name)
+
+            @wraps(func)
+            def inner(*args, **kwargs):
+                warn('adapter:{}'.format(func_name))
+                return func(*args, **kwargs)
+
+            if parse_replacement:
+                available_function = self.parse(parse_replacement)
+            else:
+                available_function = self
+            return available_function(inner)
+        return wrapper
+
+    def parse_none(self, func: Callable) -> Callable:
+        wrapper = self.parse(lambda *a, **k: None)
+        return wrapper(func)
+
+    def parse_list(self, func: Callable) -> Callable:
+        wrapper = self.parse(lambda *a, **k: [])
+        return wrapper(func)
 
 
-available.deprecated = available_deprecated
-available.parse = available_parse
-available.parse_none = available_parse(lambda *a, **k: None)
-available.parse_list = available_parse(lambda *a, **k: [])
+available = _Available()
 
 
 class AdapterMeta(abc.ABCMeta):
+    _available_: FrozenSet[str]
+    _parse_replacements_: Dict[str, Callable]
+
     def __new__(mcls, name, bases, namespace, **kwargs):
-        cls = super(AdapterMeta, mcls).__new__(mcls, name, bases, namespace,
-                                               **kwargs)
+        # mypy does not like the `**kwargs`. But `ABCMeta` itself takes
+        # `**kwargs` in its argspec here (and passes them to `type.__new__`.
+        # I'm not sure there is any benefit to it after poking around a bit,
+        # but having it doesn't hurt on the python side (and omitting it could
+        # hurt for obscure metaclass reasons, for all I know)
+        cls = abc.ABCMeta.__new__(  # type: ignore
+            mcls, name, bases, namespace, **kwargs
+        )
 
         # this is very much inspired by ABCMeta's own implementation
 
         # dict mapping the method name to whether the model name should be
         # injected into the arguments. All methods in here are exposed to the
         # context.
-        available = set()
-        replacements = {}
+        available: Set[str] = set()
+        replacements: Dict[str, Any] = {}
 
         # collect base class data first
         for base in bases:

core/dbt/adapters/base/plugin.py

@@ -1,23 +1,42 @@
-from dbt.config.project import Project
+from typing import List, Optional, Type
+
+from dbt.adapters.base import Credentials
+from dbt.exceptions import CompilationException
+from dbt.adapters.protocol import AdapterProtocol
 
 
-class AdapterPlugin(object):
+def project_name_from_path(include_path: str) -> str:
+    # avoid an import cycle
+    from dbt.config.project import Project
+    partial = Project.partial_load(include_path)
+    if partial.project_name is None:
+        raise CompilationException(
+            f'Invalid project at {include_path}: name not set!'
+        )
+    return partial.project_name
+
+
+class AdapterPlugin:
     """Defines the basic requirements for a dbt adapter plugin.
 
-    :param type adapter: An adapter class, derived from BaseAdapter
-    :param type credentials: A credentials object, derived from Credentials
-    :param str project_name: The name of this adapter plugin's associated dbt
-        project.
-    :param str include_path: The path to this adapter plugin's root
-    :param Optional[List[str]] dependencies: A list of adapter names that this
-        adapter depends upon.
+    :param include_path: The path to this adapter plugin's root
+    :param dependencies: A list of adapter names that this adapter depends
+        upon.
     """
-    def __init__(self, adapter, credentials, include_path, dependencies=None):
-        self.adapter = adapter
-        self.credentials = credentials
-        self.include_path = include_path
-        project = Project.from_project_root(include_path, {})
-        self.project_name = project.project_name
+    def __init__(
+        self,
+        adapter: Type[AdapterProtocol],
+        credentials: Type[Credentials],
+        include_path: str,
+        dependencies: Optional[List[str]] = None
+    ):
+
+        self.adapter: Type[AdapterProtocol] = adapter
+        self.credentials: Type[Credentials] = credentials
+        self.include_path: str = include_path
+        self.project_name: str = project_name_from_path(include_path)
+        self.dependencies: List[str]
         if dependencies is None:
-            dependencies = []
-        self.dependencies = dependencies
+            self.dependencies = []
+        else:
+            self.dependencies = dependencies

core/dbt/adapters/base/query_headers.py

@@ -0,0 +1,101 @@
+from threading import local
+from typing import Optional, Callable, Dict, Any
+
+from dbt.clients.jinja import QueryStringGenerator
+
+from dbt.context.manifest import generate_query_header_context
+from dbt.contracts.connection import AdapterRequiredConfig, QueryComment
+from dbt.contracts.graph.compiled import CompileResultNode
+from dbt.contracts.graph.manifest import Manifest
+from dbt.exceptions import RuntimeException
+
+
+class NodeWrapper:
+    def __init__(self, node):
+        self._inner_node = node
+
+    def __getattr__(self, name):
+        return getattr(self._inner_node, name, '')
+
+
+class _QueryComment(local):
+    """A thread-local class storing thread-specific state information for
+    connection management, namely:
+        - the current thread's query comment.
+        - a source_name indicating what set the current thread's query comment
+    """
+    def __init__(self, initial):
+        self.query_comment: Optional[str] = initial
+        self.append = False
+
+    def add(self, sql: str) -> str:
+        if not self.query_comment:
+            return sql
+
+        if self.append:
+            # replace last ';' with '<comment>;'
+            sql = sql.rstrip()
+            if sql[-1] == ';':
+                sql = sql[:-1]
+                return '{}\n/* {} */;'.format(sql, self.query_comment.strip())
+
+            return '{}\n/* {} */'.format(sql, self.query_comment.strip())
+
+        return '/* {} */\n{}'.format(self.query_comment.strip(), sql)
+
+    def set(self, comment: Optional[str], append: bool):
+        if isinstance(comment, str) and '*/' in comment:
+            # tell the user "no" so they don't hurt themselves by writing
+            # garbage
+            raise RuntimeException(
+                f'query comment contains illegal value "*/": {comment}'
+            )
+        self.query_comment = comment
+        self.append = append
+
+
+QueryStringFunc = Callable[[str, Optional[NodeWrapper]], str]
+
+
+class MacroQueryStringSetter:
+    def __init__(self, config: AdapterRequiredConfig, manifest: Manifest):
+        self.manifest = manifest
+        self.config = config
+
+        comment_macro = self._get_comment_macro()
+        self.generator: QueryStringFunc = lambda name, model: ''
+        # if the comment value was None or the empty string, just skip it
+        if comment_macro:
+            assert isinstance(comment_macro, str)
+            macro = '\n'.join((
+                '{%- macro query_comment_macro(connection_name, node) -%}',
+                comment_macro,
+                '{% endmacro %}'
+            ))
+            ctx = self._get_context()
+            self.generator = QueryStringGenerator(macro, ctx)
+        self.comment = _QueryComment(None)
+        self.reset()
+
+    def _get_comment_macro(self) -> Optional[str]:
+        return self.config.query_comment.comment
+
+    def _get_context(self) -> Dict[str, Any]:
+        return generate_query_header_context(self.config, self.manifest)
+
+    def add(self, sql: str) -> str:
+        return self.comment.add(sql)
+
+    def reset(self):
+        self.set('master', None)
+
+    def set(self, name: str, node: Optional[CompileResultNode]):
+        wrapped: Optional[NodeWrapper] = None
+        if node is not None:
+            wrapped = NodeWrapper(node)
+        comment_str = self.generator(name, wrapped)
+
+        append = False
+        if isinstance(self.config.query_comment, QueryComment):
+            append = self.config.query_comment.append
+        self.comment.set(comment_str, append)

core/dbt/adapters/base/relation.py

@@ -1,102 +1,80 @@
-from dbt.api import APIObject
-from dbt.utils import filter_null_values
+from collections.abc import Hashable
+from dataclasses import dataclass
+from typing import (
+    Optional, TypeVar, Any, Type, Dict, Union, Iterator, Tuple, Set
+)
+
+from dbt.contracts.graph.compiled import CompiledNode
+from dbt.contracts.graph.parsed import ParsedSourceDefinition, ParsedNode
+from dbt.contracts.relation import (
+    RelationType, ComponentName, HasQuoting, FakeAPIObject, Policy, Path
+)
+from dbt.exceptions import InternalException
 from dbt.node_types import NodeType
+from dbt.utils import filter_null_values, deep_merge, classproperty
 
 import dbt.exceptions
 
 
-class BaseRelation(APIObject):
+Self = TypeVar('Self', bound='BaseRelation')
 
-    Table = "table"
-    View = "view"
-    CTE = "cte"
-    MaterializedView = "materializedview"
-    ExternalTable = "externaltable"
 
-    RelationTypes = [
-        Table,
-        View,
-        CTE,
-        MaterializedView,
-        ExternalTable
-    ]
+@dataclass(frozen=True, eq=False, repr=False)
+class BaseRelation(FakeAPIObject, Hashable):
+    type: Optional[RelationType]
+    path: Path
+    quote_character: str = '"'
+    include_policy: Policy = Policy()
+    quote_policy: Policy = Policy()
+    dbt_created: bool = False
 
-    DEFAULTS = {
-        'metadata': {
-            'type': 'BaseRelation'
-        },
-        'quote_character': '"',
-        'quote_policy': {
-            'database': True,
-            'schema': True,
-            'identifier': True,
-        },
-        'include_policy': {
-            'database': True,
-            'schema': True,
-            'identifier': True,
-        },
-        'dbt_created': False,
-    }
-
-    PATH_SCHEMA = {
-        'type': 'object',
-        'properties': {
-            'database': {'type': ['string', 'null']},
-            'schema': {'type': ['string', 'null']},
-            'identifier': {'type': ['string', 'null']},
-        },
-        'required': ['database', 'schema', 'identifier'],
-    }
-
-    POLICY_SCHEMA = {
-        'type': 'object',
-        'properties': {
-            'database': {'type': 'boolean'},
-            'schema': {'type': 'boolean'},
-            'identifier': {'type': 'boolean'},
-        },
-        'required': ['database', 'schema', 'identifier'],
-    }
-
-    SCHEMA = {
-        'type': 'object',
-        'properties': {
-            'metadata': {
-                'type': 'object',
-                'properties': {
-                    'type': {
-                        'type': 'string',
-                        'const': 'BaseRelation',
-                    },
-                },
-            },
-            'type': {
-                'enum': RelationTypes + [None],
-            },
-            'path': PATH_SCHEMA,
-            'include_policy': POLICY_SCHEMA,
-            'quote_policy': POLICY_SCHEMA,
-            'quote_character': {'type': 'string'},
-            'dbt_created': {'type': 'boolean'},
-        },
-        'required': ['metadata', 'type', 'path', 'include_policy',
-                     'quote_policy', 'quote_character', 'dbt_created']
-    }
-
-    PATH_ELEMENTS = ['database', 'schema', 'identifier']
-
-    def _is_exactish_match(self, field, value):
-        if self.dbt_created and self.quote_policy.get(field) is False:
-            return self.get_path_part(field).lower() == value.lower()
+    def _is_exactish_match(self, field: ComponentName, value: str) -> bool:
+        if self.dbt_created and self.quote_policy.get_part(field) is False:
+            return self.path.get_lowered_part(field) == value.lower()
         else:
-            return self.get_path_part(field) == value
+            return self.path.get_part(field) == value
 
-    def matches(self, database=None, schema=None, identifier=None):
+    @classmethod
+    def _get_field_named(cls, field_name):
+        for field, _ in cls._get_fields():
+            if field.name == field_name:
+                return field
+        # this should be unreachable
+        raise ValueError(f'BaseRelation has no {field_name} field!')
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            return False
+        return self.to_dict() == other.to_dict()
+
+    @classmethod
+    def get_default_quote_policy(cls) -> Policy:
+        return cls._get_field_named('quote_policy').default
+
+    @classmethod
+    def get_default_include_policy(cls) -> Policy:
+        return cls._get_field_named('include_policy').default
+
+    def get(self, key, default=None):
+        """Override `.get` to return a metadata object so we don't break
+        dbt_utils.
+        """
+        if key == 'metadata':
+            return {
+                'type': self.__class__.__name__
+            }
+        return super().get(key, default)
+
+    def matches(
+        self,
+        database: Optional[str] = None,
+        schema: Optional[str] = None,
+        identifier: Optional[str] = None,
+    ) -> bool:
         search = filter_null_values({
-            'database': database,
-            'schema': schema,
-            'identifier': identifier
+            ComponentName.Database: database,
+            ComponentName.Schema: schema,
+            ComponentName.Identifier: identifier
         })
 
         if not search:
@@ -111,7 +89,7 @@ class BaseRelation(APIObject):
             if not self._is_exactish_match(k, v):
                 exact_match = False
 
-            if self.get_path_part(k).lower() != v.lower():
+            if self.path.get_lowered_part(k) != v.lower():
                 approximate_match = False
 
         if approximate_match and not exact_match:
@@ -122,107 +100,99 @@ class BaseRelation(APIObject):
 
         return exact_match
 
-    def get_path_part(self, part):
-        return self.path.get(part)
+    def replace_path(self, **kwargs):
+        return self.replace(path=self.path.replace(**kwargs))
 
-    def should_quote(self, part):
-        return self.quote_policy.get(part)
-
-    def should_include(self, part):
-        return self.include_policy.get(part)
-
-    def quote(self, database=None, schema=None, identifier=None):
+    def quote(
+        self: Self,
+        database: Optional[bool] = None,
+        schema: Optional[bool] = None,
+        identifier: Optional[bool] = None,
+    ) -> Self:
         policy = filter_null_values({
-            'database': database,
-            'schema': schema,
-            'identifier': identifier
+            ComponentName.Database: database,
+            ComponentName.Schema: schema,
+            ComponentName.Identifier: identifier
         })
 
-        return self.incorporate(quote_policy=policy)
+        new_quote_policy = self.quote_policy.replace_dict(policy)
+        return self.replace(quote_policy=new_quote_policy)
 
-    def include(self, database=None, schema=None, identifier=None):
+    def include(
+        self: Self,
+        database: Optional[bool] = None,
+        schema: Optional[bool] = None,
+        identifier: Optional[bool] = None,
+    ) -> Self:
         policy = filter_null_values({
-            'database': database,
-            'schema': schema,
-            'identifier': identifier
+            ComponentName.Database: database,
+            ComponentName.Schema: schema,
+            ComponentName.Identifier: identifier
         })
 
-        return self.incorporate(include_policy=policy)
+        new_include_policy = self.include_policy.replace_dict(policy)
+        return self.replace(include_policy=new_include_policy)
 
-    def information_schema(self, identifier=None):
-        include_db = self.database is not None
-        include_policy = filter_null_values({
-            'database': include_db,
-            'schema': True,
-            'identifier': identifier is not None
-        })
-        quote_policy = filter_null_values({
-            'database': self.quote_policy['database'],
-            'schema': False,
-            'identifier': False,
-        })
+    def information_schema(self, view_name=None) -> 'InformationSchema':
+        # some of our data comes from jinja, where things can be `Undefined`.
+        if not isinstance(view_name, str):
+            view_name = None
 
-        path_update = {
-            'schema': 'information_schema',
-            'identifier': identifier
-        }
+        # Kick the user-supplied schema out of the information schema relation
+        # Instead address this as <database>.information_schema by default
+        info_schema = InformationSchema.from_relation(self, view_name)
+        return info_schema.incorporate(path={"schema": None})
 
-        return self.incorporate(
-            quote_policy=quote_policy,
-            include_policy=include_policy,
-            path=path_update,
-            table_name=identifier)
-
-    def information_schema_only(self):
+    def information_schema_only(self) -> 'InformationSchema':
         return self.information_schema()
 
-    def information_schema_table(self, identifier):
-        return self.information_schema(identifier)
+    def without_identifier(self) -> 'BaseRelation':
+        """Return a form of this relation that only has the database and schema
+        set to included. To get the appropriately-quoted form the schema out of
+        the result (for use as part of a query), use `.render()`. To get the
+        raw database or schema name, use `.database` or `.schema`.
 
-    def render(self, use_table_name=True):
-        parts = []
+        The hash of the returned object is the result of render().
+        """
+        return self.include(identifier=False).replace_path(identifier=None)
 
-        for k in self.PATH_ELEMENTS:
-            if self.should_include(k):
-                path_part = self.get_path_part(k)
+    def _render_iterator(
+        self
+    ) -> Iterator[Tuple[Optional[ComponentName], Optional[str]]]:
 
-                if path_part is None:
-                    continue
-                elif k == 'identifier':
-                    if use_table_name:
-                        path_part = self.table
-                    else:
-                        path_part = self.identifier
+        for key in ComponentName:
+            path_part: Optional[str] = None
+            if self.include_policy.get_part(key):
+                path_part = self.path.get_part(key)
+                if path_part is not None and self.quote_policy.get_part(key):
+                    path_part = self.quoted(path_part)
+            yield key, path_part
 
-                parts.append(
-                    self.quote_if(
-                        path_part,
-                        self.should_quote(k)))
-
-        if len(parts) == 0:
-            raise dbt.exceptions.RuntimeException(
-                "No path parts are included! Nothing to render.")
-
-        return '.'.join(parts)
-
-    def quote_if(self, identifier, should_quote):
-        if should_quote:
-            return self.quoted(identifier)
-
-        return identifier
+    def render(self) -> str:
+        # if there is nothing set, this will return the empty string.
+        return '.'.join(
+            part for _, part in self._render_iterator()
+            if part is not None
+        )
 
     def quoted(self, identifier):
         return '{quote_char}{identifier}{quote_char}'.format(
             quote_char=self.quote_character,
-            identifier=identifier)
+            identifier=identifier,
+        )
 
     @classmethod
-    def create_from_source(cls, source, **kwargs):
-        quote_policy = dbt.utils.deep_merge(
-            cls.DEFAULTS['quote_policy'],
-            source.quoting,
-            kwargs.get('quote_policy', {})
+    def create_from_source(
+        cls: Type[Self], source: ParsedSourceDefinition, **kwargs: Any
+    ) -> Self:
+        source_quoting = source.quoting.to_dict()
+        source_quoting.pop('column', None)
+        quote_policy = deep_merge(
+            cls.get_default_quote_policy().to_dict(),
+            source_quoting,
+            kwargs.get('quote_policy', {}),
         )
+
         return cls.create(
             database=source.database,
             schema=source.schema,
@@ -231,176 +201,255 @@ class BaseRelation(APIObject):
             **kwargs
         )
 
+    @staticmethod
+    def add_ephemeral_prefix(name: str):
+        return f'__dbt__cte__{name}'
+
     @classmethod
-    def create_from_node(cls, config, node, table_name=None, quote_policy=None,
-                         **kwargs):
+    def create_ephemeral_from_node(
+        cls: Type[Self],
+        config: HasQuoting,
+        node: Union[ParsedNode, CompiledNode],
+    ) -> Self:
+        # Note that ephemeral models are based on the name.
+        identifier = cls.add_ephemeral_prefix(node.name)
+        return cls.create(
+            type=cls.CTE,
+            identifier=identifier,
+        ).quote(identifier=False)
+
+    @classmethod
+    def create_from_node(
+        cls: Type[Self],
+        config: HasQuoting,
+        node: Union[ParsedNode, CompiledNode],
+        quote_policy: Optional[Dict[str, bool]] = None,
+        **kwargs: Any,
+    ) -> Self:
         if quote_policy is None:
             quote_policy = {}
 
         quote_policy = dbt.utils.merge(config.quoting, quote_policy)
 
         return cls.create(
-            database=node.get('database'),
-            schema=node.get('schema'),
-            identifier=node.get('alias'),
-            table_name=table_name,
+            database=node.database,
+            schema=node.schema,
+            identifier=node.alias,
             quote_policy=quote_policy,
             **kwargs)
 
     @classmethod
-    def create_from(cls, config, node, **kwargs):
+    def create_from(
+        cls: Type[Self],
+        config: HasQuoting,
+        node: Union[CompiledNode, ParsedNode, ParsedSourceDefinition],
+        **kwargs: Any,
+    ) -> Self:
         if node.resource_type == NodeType.Source:
+            if not isinstance(node, ParsedSourceDefinition):
+                raise InternalException(
+                    'type mismatch, expected ParsedSourceDefinition but got {}'
+                    .format(type(node))
+                )
             return cls.create_from_source(node, **kwargs)
         else:
+            if not isinstance(node, (ParsedNode, CompiledNode)):
+                raise InternalException(
+                    'type mismatch, expected ParsedNode or CompiledNode but '
+                    'got {}'.format(type(node))
+                )
             return cls.create_from_node(config, node, **kwargs)
 
     @classmethod
-    def create(cls, database=None, schema=None,
-               identifier=None, table_name=None,
-               type=None, **kwargs):
-        if table_name is None:
-            table_name = identifier
+    def create(
+        cls: Type[Self],
+        database: Optional[str] = None,
+        schema: Optional[str] = None,
+        identifier: Optional[str] = None,
+        type: Optional[RelationType] = None,
+        **kwargs,
+    ) -> Self:
+        kwargs.update({
+            'path': {
+                'database': database,
+                'schema': schema,
+                'identifier': identifier,
+            },
+            'type': type,
+        })
+        return cls.from_dict(kwargs)
 
-        return cls(type=type,
-                   path={
-                       'database': database,
-                       'schema': schema,
-                       'identifier': identifier
-                   },
-                   table_name=table_name,
-                   **kwargs)
-
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<{} {}>".format(self.__class__.__name__, self.render())
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return hash(self.render())
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.render()
 
     @property
-    def path(self):
-        return self.get('path', {})
+    def database(self) -> Optional[str]:
+        return self.path.database
 
     @property
-    def database(self):
-        return self.path.get('database')
+    def schema(self) -> Optional[str]:
+        return self.path.schema
 
     @property
-    def schema(self):
-        return self.path.get('schema')
+    def identifier(self) -> Optional[str]:
+        return self.path.identifier
 
     @property
-    def identifier(self):
-        return self.path.get('identifier')
+    def table(self) -> Optional[str]:
+        return self.path.identifier
 
     # Here for compatibility with old Relation interface
     @property
-    def name(self):
+    def name(self) -> Optional[str]:
         return self.identifier
 
-    # Here for compatibility with old Relation interface
     @property
-    def table(self):
-        return self.table_name
+    def is_table(self) -> bool:
+        return self.type == RelationType.Table
 
     @property
-    def is_table(self):
-        return self.type == self.Table
+    def is_cte(self) -> bool:
+        return self.type == RelationType.CTE
 
     @property
-    def is_cte(self):
-        return self.type == self.CTE
+    def is_view(self) -> bool:
+        return self.type == RelationType.View
 
-    @property
-    def is_view(self):
-        return self.type == self.View
+    @classproperty
+    def Table(cls) -> str:
+        return str(RelationType.Table)
+
+    @classproperty
+    def CTE(cls) -> str:
+        return str(RelationType.CTE)
+
+    @classproperty
+    def View(cls) -> str:
+        return str(RelationType.View)
+
+    @classproperty
+    def External(cls) -> str:
+        return str(RelationType.External)
+
+    @classproperty
+    def get_relation_type(cls) -> Type[RelationType]:
+        return RelationType
 
 
-class Column(object):
-    TYPE_LABELS = {
-        'STRING': 'TEXT',
-        'TIMESTAMP': 'TIMESTAMP',
-        'FLOAT': 'FLOAT',
-        'INTEGER': 'INT'
-    }
+Info = TypeVar('Info', bound='InformationSchema')
 
-    def __init__(self, column, dtype, char_size=None, numeric_precision=None,
-                 numeric_scale=None):
-        self.column = column
-        self.dtype = dtype
-        self.char_size = char_size
-        self.numeric_precision = numeric_precision
-        self.numeric_scale = numeric_scale
+
+@dataclass(frozen=True, eq=False, repr=False)
+class InformationSchema(BaseRelation):
+    information_schema_view: Optional[str] = None
+
+    def __post_init__(self):
+        if not isinstance(self.information_schema_view, (type(None), str)):
+            raise dbt.exceptions.CompilationException(
+                'Got an invalid name: {}'.format(self.information_schema_view)
+            )
 
     @classmethod
-    def translate_type(cls, dtype):
-        return cls.TYPE_LABELS.get(dtype.upper(), dtype)
+    def get_path(
+        cls, relation: BaseRelation, information_schema_view: Optional[str]
+    ) -> Path:
+        return Path(
+            database=relation.database,
+            schema=relation.schema,
+            identifier='INFORMATION_SCHEMA',
+        )
 
     @classmethod
-    def create(cls, name, label_or_dtype):
-        column_type = cls.translate_type(label_or_dtype)
-        return cls(name, column_type)
-
-    @property
-    def name(self):
-        return self.column
-
-    @property
-    def quoted(self):
-        return '"{}"'.format(self.column)
-
-    @property
-    def data_type(self):
-        if self.is_string():
-            return Column.string_type(self.string_size())
-        elif self.is_numeric():
-            return Column.numeric_type(self.dtype, self.numeric_precision,
-                                       self.numeric_scale)
-        else:
-            return self.dtype
-
-    def is_string(self):
-        return self.dtype.lower() in ['text', 'character varying', 'character',
-                                      'varchar']
-
-    def is_numeric(self):
-        return self.dtype.lower() in ['numeric', 'number']
-
-    def string_size(self):
-        if not self.is_string():
-            raise RuntimeError("Called string_size() on non-string field!")
-
-        if self.dtype == 'text' or self.char_size is None:
-            # char_size should never be None. Handle it reasonably just in case
-            return 256
-        else:
-            return int(self.char_size)
-
-    def can_expand_to(self, other_column):
-        """returns True if this column can be expanded to the size of the
-        other column"""
-        if not self.is_string() or not other_column.is_string():
-            return False
-
-        return other_column.string_size() > self.string_size()
-
-    def literal(self, value):
-        return "{}::{}".format(value, self.data_type)
+    def get_include_policy(
+        cls,
+        relation,
+        information_schema_view: Optional[str],
+    ) -> Policy:
+        return relation.include_policy.replace(
+            database=relation.database is not None,
+            schema=False,
+            identifier=True,
+        )
 
     @classmethod
-    def string_type(cls, size):
-        return "character varying({})".format(size)
+    def get_quote_policy(
+        cls,
+        relation,
+        information_schema_view: Optional[str],
+    ) -> Policy:
+        return relation.quote_policy.replace(
+            identifier=False,
+        )
 
     @classmethod
-    def numeric_type(cls, dtype, precision, scale):
-        # This could be decimal(...), numeric(...), number(...)
-        # Just use whatever was fed in here -- don't try to get too clever
-        if precision is None or scale is None:
-            return dtype
-        else:
-            return "{}({},{})".format(dtype, precision, scale)
+    def from_relation(
+        cls: Type[Info],
+        relation: BaseRelation,
+        information_schema_view: Optional[str],
+    ) -> Info:
+        include_policy = cls.get_include_policy(
+            relation, information_schema_view
+        )
+        quote_policy = cls.get_quote_policy(relation, information_schema_view)
+        path = cls.get_path(relation, information_schema_view)
+        return cls(
+            type=RelationType.View,
+            path=path,
+            include_policy=include_policy,
+            quote_policy=quote_policy,
+            information_schema_view=information_schema_view,
+        )
 
-    def __repr__(self):
-        return "<Column {} ({})>".format(self.name, self.data_type)
+    def _render_iterator(self):
+        for k, v in super()._render_iterator():
+            yield k, v
+        yield None, self.information_schema_view
+
+
+class SchemaSearchMap(Dict[InformationSchema, Set[Optional[str]]]):
+    """A utility class to keep track of what information_schema tables to
+    search for what schemas. The schema values are all lowercased to avoid
+    duplication.
+    """
+    def add(self, relation: BaseRelation):
+        key = relation.information_schema_only()
+        if key not in self:
+            self[key] = set()
+        schema: Optional[str] = None
+        if relation.schema is not None:
+            schema = relation.schema.lower()
+        self[key].add(schema)
+
+    def search(
+        self
+    ) -> Iterator[Tuple[InformationSchema, Optional[str]]]:
+        for information_schema_name, schemas in self.items():
+            for schema in schemas:
+                yield information_schema_name, schema
+
+    def flatten(self):
+        new = self.__class__()
+
+        # make sure we don't have duplicates
+        seen = {r.database.lower() for r in self if r.database}
+        if len(seen) > 1:
+            dbt.exceptions.raise_compiler_error(str(seen))
+
+        for information_schema_name, schema in self.search():
+            path = {
+                'database': information_schema_name.database,
+                'schema': schema
+            }
+            new.add(information_schema_name.incorporate(
+                path=path,
+                quote_policy={'database': False},
+                include_policy={'database': False},
+            ))
+
+        return new

core/dbt/adapters/cache.py

@@ -1,39 +1,34 @@
 from collections import namedtuple
-import threading
 from copy import deepcopy
-import pprint
-from dbt.logger import CACHE_LOGGER as logger
-import dbt.exceptions
+from typing import List, Iterable, Optional, Dict, Set, Tuple, Any
+import threading
 
+from dbt.logger import CACHE_LOGGER as logger
+from dbt.utils import lowercase
+import dbt.exceptions
 
 _ReferenceKey = namedtuple('_ReferenceKey', 'database schema identifier')
 
 
-def _lower(value):
-    """Postgres schemas can be None so we can't just call lower()."""
-    if value is None:
-        return None
-    return value.lower()
-
-
-def _make_key(relation):
+def _make_key(relation) -> _ReferenceKey:
     """Make _ReferenceKeys with lowercase values for the cache so we don't have
     to keep track of quoting
     """
-    return _ReferenceKey(_lower(relation.database),
-                         _lower(relation.schema),
-                         _lower(relation.identifier))
+    # databases and schemas can both be None
+    return _ReferenceKey(lowercase(relation.database),
+                         lowercase(relation.schema),
+                         lowercase(relation.identifier))
 
 
-def dot_separated(key):
+def dot_separated(key: _ReferenceKey) -> str:
     """Return the key in dot-separated string form.
 
-    :param key _ReferenceKey: The key to stringify.
+    :param _ReferenceKey key: The key to stringify.
     """
     return '.'.join(map(str, key))
 
 
-class _CachedRelation(object):
+class _CachedRelation:
     """Nothing about _CachedRelation is guaranteed to be thread-safe!
 
     :attr str schema: The schema of this relation.
@@ -46,22 +41,22 @@ class _CachedRelation(object):
         self.referenced_by = {}
         self.inner = inner
 
-    def __str__(self):
+    def __str__(self) -> str:
         return (
             '_CachedRelation(database={}, schema={}, identifier={}, inner={})'
         ).format(self.database, self.schema, self.identifier, self.inner)
 
     @property
-    def database(self):
-        return _lower(self.inner.database)
+    def database(self) -> Optional[str]:
+        return lowercase(self.inner.database)
 
     @property
-    def schema(self):
-        return _lower(self.inner.schema)
+    def schema(self) -> Optional[str]:
+        return lowercase(self.inner.schema)
 
     @property
-    def identifier(self):
-        return _lower(self.inner.identifier)
+    def identifier(self) -> Optional[str]:
+        return lowercase(self.inner.identifier)
 
     def __copy__(self):
         new = self.__class__(self.inner)
@@ -83,7 +78,7 @@ class _CachedRelation(object):
         """
         return _make_key(self)
 
-    def add_reference(self, referrer):
+    def add_reference(self, referrer: '_CachedRelation'):
         """Add a reference from referrer to self, indicating that if this node
         were drop...cascaded, the referrer would be dropped as well.
 
@@ -131,7 +126,6 @@ class _CachedRelation(object):
                 'schema': new_relation.inner.schema,
                 'identifier': new_relation.inner.identifier
             },
-            table_name=new_relation.inner.identifier
         )
 
     def rename_key(self, old_key, new_key):
@@ -163,7 +157,13 @@ class _CachedRelation(object):
         return [dot_separated(r) for r in self.referenced_by]
 
 
-class RelationsCache(object):
+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.
 
@@ -172,45 +172,56 @@ class RelationsCache(object):
         The adapters also hold this lock while filling the cache.
     :attr Set[str] schemas: The set of known/cached schemas, all lowercased.
     """
-    def __init__(self):
-        self.relations = {}
+    def __init__(self) -> None:
+        self.relations: Dict[_ReferenceKey, _CachedRelation] = {}
         self.lock = threading.RLock()
-        self.schemas = set()
+        self.schemas: Set[Tuple[Optional[str], Optional[str]]] = set()
 
-    def add_schema(self, database, schema):
+    def add_schema(
+        self, database: Optional[str], schema: Optional[str],
+    ) -> None:
         """Add a schema to the set of known schemas (case-insensitive)
 
-        :param str database: The database name to add.
-        :param str schema: The schema name to add.
+        :param database: The database name to add.
+        :param schema: The schema name to add.
         """
-        self.schemas.add((_lower(database), _lower(schema)))
+        self.schemas.add((lowercase(database), lowercase(schema)))
 
-    def remove_schema(self, database, schema):
-        """Remove a schema from the set of known schemas (case-insensitive)
+    def drop_schema(
+        self, database: Optional[str], schema: Optional[str],
+    ) -> None:
+        """Drop the given schema and remove it from the set of known schemas.
 
-        If the schema does not exist, it will be ignored - it could just be a
-        temporary table.
-
-        :param str database: The database name to remove.
-        :param str schema: The schema name to remove.
+        Then remove all its contents (and their dependents, etc) as well.
         """
-        self.schemas.discard((_lower(database), _lower(schema)))
+        key = (lowercase(database), lowercase(schema))
+        if key not in self.schemas:
+            return
 
-    def update_schemas(self, schemas):
+        # avoid iterating over self.relations while removing things by
+        # collecting the list first.
+
+        with self.lock:
+            to_remove = self._list_relations_in_schema(database, schema)
+            self._remove_all(to_remove)
+            # handle a drop_schema race by using discard() over remove()
+            self.schemas.discard(key)
+
+    def update_schemas(self, schemas: Iterable[Tuple[Optional[str], str]]):
         """Add multiple schemas to the set of known schemas (case-insensitive)
 
-        :param Iterable[str] schemas: An iterable of the schema names to add.
+        :param schemas: An iterable of the schema names to add.
         """
-        self.schemas.update((_lower(d), _lower(s)) for (d, s) in schemas)
+        self.schemas.update((lowercase(d), s.lower()) for (d, s) in schemas)
 
-    def __contains__(self, schema_id):
+    def __contains__(self, schema_id: Tuple[Optional[str], str]):
         """A schema is 'in' the relations cache if it is in the set of cached
         schemas.
 
-        :param Tuple[str, str] schema: The db name and schema name to look up.
+        :param schema_id: The db name and schema name to look up.
         """
         db, schema = schema_id
-        return (_lower(db), _lower(schema)) in self.schemas
+        return (lowercase(db), schema.lower()) in self.schemas
 
     def dump_graph(self):
         """Dump a key-only representation of the schema to a dictionary. Every
@@ -226,7 +237,7 @@ class RelationsCache(object):
                 for k, v in self.relations.items()
             }
 
-    def _setdefault(self, relation):
+    def _setdefault(self, relation: _CachedRelation):
         """Add a relation to the cache, or return it if it already exists.
 
         :param _CachedRelation relation: The relation to set or get.
@@ -248,6 +259,8 @@ class RelationsCache(object):
         :raises InternalError: If either entry does not exist.
         """
         referenced = self.relations.get(referenced_key)
+        if referenced is None:
+            return
         if referenced is None:
             dbt.exceptions.raise_cache_inconsistent(
                 'in add_link, referenced link key {} not in cache!'
@@ -261,11 +274,13 @@ class RelationsCache(object):
                 .format(dependent_key)
             )
 
+        assert dependent is not None  # we just raised!
+
         referenced.add_reference(dependent)
 
     def add_link(self, referenced, dependent):
-        """Add a link between two relations to the database. Both the old and
-        new entries must already exist in the database.
+        """Add a link between two relations to the database. If either relation
+        does not exist, it will be added as an "external" relation.
 
         The dependent model refers _to_ the referenced model. So, given
         arguments of (jake_test, bar, jake_test, foo):
@@ -277,23 +292,36 @@ class RelationsCache(object):
         :param BaseRelation dependent: The dependent model.
         :raises InternalError: If either entry does not exist.
         """
-        referenced = _make_key(referenced)
-        if (referenced.database, referenced.schema) not in self:
+        ref_key = _make_key(referenced)
+        if (ref_key.database, ref_key.schema) not in self:
             # 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=referenced)
+                .format(dep=dependent, ref=ref_key)
             )
             return
-        dependent = _make_key(dependent)
+        if ref_key not in self.relations:
+            # Insert a dummy "external" relation.
+            referenced = referenced.replace(
+                type=referenced.External
+            )
+            self.add(referenced)
+
+        dep_key = _make_key(dependent)
+        if dep_key not in self.relations:
+            # Insert a dummy "external" relation.
+            dependent = dependent.replace(
+                type=referenced.External
+            )
+            self.add(dependent)
         logger.debug(
-            'adding link, {!s} references {!s}'.format(dependent, referenced)
+            'adding link, {!s} references {!s}'.format(dep_key, ref_key)
         )
         with self.lock:
-            self._add_link(referenced, dependent)
+            self._add_link(ref_key, dep_key)
 
     def add(self, relation):
         """Add the relation inner to the cache, under the schema schema and
@@ -303,14 +331,13 @@ class RelationsCache(object):
         """
         cached = _CachedRelation(relation)
         logger.debug('Adding relation: {!s}'.format(cached))
-        logger.debug('before adding: {}'.format(
-            pprint.pformat(self.dump_graph()))
-        )
+
+        lazy_log('before adding: {!s}', self.dump_graph)
+
         with self.lock:
             self._setdefault(cached)
-        logger.debug('after adding: {}'.format(
-            pprint.pformat(self.dump_graph()))
-        )
+
+        lazy_log('after adding: {!s}', self.dump_graph)
 
     def _remove_refs(self, keys):
         """Removes all references to all entries in keys. This does not
@@ -384,7 +411,6 @@ class RelationsCache(object):
 
         self.relations[new_key] = relation
         # also fixup the schemas!
-        self.remove_schema(old_key.database, old_key.schema)
         self.add_schema(new_key.database, new_key.schema)
 
         return True
@@ -431,11 +457,10 @@ class RelationsCache(object):
         old_key = _make_key(old)
         new_key = _make_key(new)
         logger.debug('Renaming relation {!s} to {!s}'.format(
-            old_key, new_key)
-        )
-        logger.debug('before rename: {}'.format(
-            pprint.pformat(self.dump_graph()))
-        )
+            old_key, new_key
+        ))
+
+        lazy_log('before rename: {!s}', self.dump_graph)
 
         with self.lock:
             if self._check_rename_constraints(old_key, new_key):
@@ -443,23 +468,24 @@ class RelationsCache(object):
             else:
                 self._setdefault(_CachedRelation(new))
 
-        logger.debug('after rename: {}'.format(
-            pprint.pformat(self.dump_graph()))
-        )
+        lazy_log('after rename: {!s}', self.dump_graph)
 
-    def get_relations(self, database, schema):
+    def get_relations(
+        self, database: Optional[str], schema: Optional[str]
+    ) -> List[Any]:
         """Case-insensitively yield all relations matching the given schema.
 
         :param str schema: The case-insensitive schema name to list from.
         :return List[BaseRelation]: The list of relations with the given
             schema
         """
-        schema = _lower(schema)
+        database = lowercase(database)
+        schema = lowercase(schema)
         with self.lock:
             results = [
                 r.inner for r in self.relations.values()
-                if (r.schema == _lower(schema) and
-                    r.database == _lower(database))
+                if (lowercase(r.schema) == schema and
+                    lowercase(r.database) == database)
             ]
 
         if None in results:
@@ -473,3 +499,25 @@ class RelationsCache(object):
         with self.lock:
             self.relations.clear()
             self.schemas.clear()
+
+    def _list_relations_in_schema(
+        self, database: Optional[str], schema: Optional[str]
+    ) -> List[_CachedRelation]:
+        """Get the relations in a schema. Callers should hold the lock."""
+        key = (lowercase(database), lowercase(schema))
+
+        to_remove: List[_CachedRelation] = []
+        for cachekey, relation in self.relations.items():
+            if (cachekey.database, cachekey.schema) == key:
+                to_remove.append(relation)
+        return to_remove
+
+    def _remove_all(self, to_remove: List[_CachedRelation]):
+        """Remove all the listed relations. Ignore relations that have been
+        cascaded out.
+        """
+        for relation in to_remove:
+            # it may have been cascaded out already
+            drop_key = _make_key(relation)
+            if drop_key in self.relations:
+                self.drop(drop_key)

core/dbt/adapters/factory.py

@@ -1,84 +1,227 @@
-import dbt.exceptions
-from importlib import import_module
-from dbt.include.global_project import PACKAGES
-
 import threading
+from pathlib import Path
+from importlib import import_module
+from typing import Type, Dict, Any, List, Optional, Set
 
-ADAPTER_TYPES = {}
-
-_ADAPTERS = {}
-_ADAPTER_LOCK = threading.Lock()
+from dbt.exceptions import RuntimeException, InternalException
+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.contracts.connection import Credentials, AdapterRequiredConfig
 
 
-def get_adapter_class_by_name(adapter_name):
-    with _ADAPTER_LOCK:
-        if adapter_name in ADAPTER_TYPES:
-            return ADAPTER_TYPES[adapter_name]
-
-    message = "Invalid adapter type {}! Must be one of {}"
-    adapter_names = ", ".join(ADAPTER_TYPES.keys())
-    formatted_message = message.format(adapter_name, adapter_names)
-    raise dbt.exceptions.RuntimeException(formatted_message)
+from dbt.adapters.protocol import (
+    AdapterProtocol,
+    AdapterConfig,
+    RelationProtocol,
+)
+from dbt.adapters.base.plugin import AdapterPlugin
 
 
-def get_relation_class_by_name(adapter_name):
-    adapter = get_adapter_class_by_name(adapter_name)
-    return adapter.Relation
+Adapter = AdapterProtocol
 
 
-def load_plugin(adapter_name):
-    try:
-        mod = import_module('.' + adapter_name, 'dbt.adapters')
-    except ImportError:
-        raise dbt.exceptions.RuntimeException(
-            "Could not find adapter type {}!".format(adapter_name)
-        )
-    plugin = mod.Plugin
+class AdapterContainer:
+    def __init__(self):
+        self.lock = threading.Lock()
+        self.adapters: Dict[str, Adapter] = {}
+        self.plugins: Dict[str, AdapterPlugin] = {}
+        # map package names to their include paths
+        self.packages: Dict[str, Path] = {
+            GLOBAL_PROJECT_NAME: Path(GLOBAL_PROJECT_PATH),
+        }
 
-    if plugin.adapter.type() != adapter_name:
-        raise dbt.exceptions.RuntimeException(
-            'Expected to find adapter with type named {}, got adapter with '
-            'type {}'
-            .format(adapter_name, plugin.adapter.type())
-        )
+    def get_plugin_by_name(self, name: str) -> AdapterPlugin:
+        with self.lock:
+            if name in self.plugins:
+                return self.plugins[name]
+            names = ", ".join(self.plugins.keys())
 
-    with _ADAPTER_LOCK:
-        ADAPTER_TYPES[adapter_name] = plugin.adapter
+        message = f"Invalid adapter type {name}! Must be one of {names}"
+        raise RuntimeException(message)
 
-    PACKAGES[plugin.project_name] = plugin.include_path
+    def get_adapter_class_by_name(self, name: str) -> Type[Adapter]:
+        plugin = self.get_plugin_by_name(name)
+        return plugin.adapter
 
-    for dep in plugin.dependencies:
-        load_plugin(dep)
+    def get_relation_class_by_name(self, name: str) -> Type[RelationProtocol]:
+        adapter = self.get_adapter_class_by_name(name)
+        return adapter.Relation
 
-    return plugin.credentials
+    def get_config_class_by_name(
+        self, name: str
+    ) -> Type[AdapterConfig]:
+        adapter = self.get_adapter_class_by_name(name)
+        return adapter.AdapterSpecificConfigs
 
+    def load_plugin(self, name: str) -> Type[Credentials]:
+        # this doesn't need a lock: in the worst case we'll overwrite packages
+        # and adapter_type entries with the same value, as they're all
+        # singletons
+        try:
+            # mypy doesn't think modules have any attributes.
+            mod: Any = import_module('.' + name, 'dbt.adapters')
+        except ModuleNotFoundError as exc:
+            # 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:
+                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)
+            raise
+        plugin: AdapterPlugin = mod.Plugin
+        plugin_type = plugin.adapter.type()
 
-def get_adapter(config):
-    adapter_name = config.credentials.type
-    if adapter_name in _ADAPTERS:
-        return _ADAPTERS[adapter_name]
-
-    with _ADAPTER_LOCK:
-        if adapter_name not in ADAPTER_TYPES:
-            raise dbt.exceptions.RuntimeException(
-                "Could not find adapter type {}!".format(adapter_name)
+        if plugin_type != name:
+            raise RuntimeException(
+                f'Expected to find adapter with type named {name}, got '
+                f'adapter with type {plugin_type}'
             )
 
-        adapter_type = ADAPTER_TYPES[adapter_name]
+        with self.lock:
+            # things do hold the lock to iterate over it so we need it to add
+            self.plugins[name] = plugin
 
-        # check again, in case something was setting it before
-        if adapter_name in _ADAPTERS:
-            return _ADAPTERS[adapter_name]
+        self.packages[plugin.project_name] = Path(plugin.include_path)
 
-        adapter = adapter_type(config)
-        _ADAPTERS[adapter_name] = adapter
-        return adapter
+        for dep in plugin.dependencies:
+            self.load_plugin(dep)
+
+        return plugin.credentials
+
+    def register_adapter(self, config: AdapterRequiredConfig) -> None:
+        adapter_name = config.credentials.type
+        adapter_type = self.get_adapter_class_by_name(adapter_name)
+
+        with self.lock:
+            if adapter_name in self.adapters:
+                # this shouldn't really happen...
+                return
+
+            adapter: Adapter = adapter_type(config)  # type: ignore
+            self.adapters[adapter_name] = adapter
+
+    def lookup_adapter(self, adapter_name: str) -> Adapter:
+        return self.adapters[adapter_name]
+
+    def reset_adapters(self):
+        """Clear the adapters. This is useful for tests, which change configs.
+        """
+        with self.lock:
+            for adapter in self.adapters.values():
+                adapter.cleanup_connections()
+            self.adapters.clear()
+
+    def cleanup_connections(self):
+        """Only clean up the adapter connections list without resetting the
+        actual adapters.
+        """
+        with self.lock:
+            for adapter in self.adapters.values():
+                adapter.cleanup_connections()
+
+    def get_adapter_plugins(self, name: Optional[str]) -> List[AdapterPlugin]:
+        """Iterate over the known adapter plugins. If a name is provided,
+        iterate in dependency order over the named plugin and its dependencies.
+        """
+        if name is None:
+            return list(self.plugins.values())
+
+        plugins: List[AdapterPlugin] = []
+        seen: Set[str] = set()
+        plugin_names: List[str] = [name]
+        while plugin_names:
+            plugin_name = plugin_names[0]
+            plugin_names = plugin_names[1:]
+            try:
+                plugin = self.plugins[plugin_name]
+            except KeyError:
+                raise InternalException(
+                    f'No plugin found for {plugin_name}'
+                ) from None
+            plugins.append(plugin)
+            seen.add(plugin_name)
+            if plugin.dependencies is None:
+                continue
+            for dep in plugin.dependencies:
+                if dep not in seen:
+                    plugin_names.append(dep)
+        return plugins
+
+    def get_adapter_package_names(self, name: Optional[str]) -> List[str]:
+        package_names: List[str] = [
+            p.project_name for p in self.get_adapter_plugins(name)
+        ]
+        package_names.append(GLOBAL_PROJECT_NAME)
+        return package_names
+
+    def get_include_paths(self, name: Optional[str]) -> List[Path]:
+        paths = []
+        for package_name in self.get_adapter_package_names(name):
+            try:
+                path = self.packages[package_name]
+            except KeyError:
+                raise InternalException(
+                    f'No internal package listing found for {package_name}'
+                )
+            paths.append(path)
+        return paths
+
+    def get_adapter_type_names(self, name: Optional[str]) -> List[str]:
+        return [p.adapter.type() for p in self.get_adapter_plugins(name)]
+
+
+FACTORY: AdapterContainer = AdapterContainer()
+
+
+def register_adapter(config: AdapterRequiredConfig) -> None:
+    FACTORY.register_adapter(config)
+
+
+def get_adapter(config: AdapterRequiredConfig):
+    return FACTORY.lookup_adapter(config.credentials.type)
 
 
 def reset_adapters():
     """Clear the adapters. This is useful for tests, which change configs.
     """
-    with _ADAPTER_LOCK:
-        for adapter in _ADAPTERS.values():
-            adapter.cleanup_connections()
-        _ADAPTERS.clear()
+    FACTORY.reset_adapters()
+
+
+def cleanup_connections():
+    """Only clean up the adapter connections list without resetting the actual
+    adapters.
+    """
+    FACTORY.cleanup_connections()
+
+
+def get_adapter_class_by_name(name: str) -> Type[AdapterProtocol]:
+    return FACTORY.get_adapter_class_by_name(name)
+
+
+def get_config_class_by_name(name: str) -> Type[AdapterConfig]:
+    return FACTORY.get_config_class_by_name(name)
+
+
+def get_relation_class_by_name(name: str) -> Type[RelationProtocol]:
+    return FACTORY.get_relation_class_by_name(name)
+
+
+def load_plugin(name: str) -> Type[Credentials]:
+    return FACTORY.load_plugin(name)
+
+
+def get_include_paths(name: Optional[str]) -> List[Path]:
+    return FACTORY.get_include_paths(name)
+
+
+def get_adapter_package_names(name: Optional[str]) -> List[str]:
+    return FACTORY.get_adapter_package_names(name)
+
+
+def get_adapter_type_names(name: Optional[str]) -> List[str]:
+    return FACTORY.get_adapter_type_names(name)

core/dbt/adapters/protocol.py

@@ -0,0 +1,163 @@
+from dataclasses import dataclass
+from typing import (
+    Type, Hashable, Optional, ContextManager, List, Generic, TypeVar, ClassVar,
+    Tuple, Union, Dict, Any
+)
+from typing_extensions import Protocol
+
+import agate
+
+from dbt.contracts.connection import (
+    Connection, AdapterRequiredConfig, AdapterResponse
+)
+from dbt.contracts.graph.compiled import (
+    CompiledNode, ManifestNode, NonSourceCompiledNode
+)
+from dbt.contracts.graph.parsed import ParsedNode, ParsedSourceDefinition
+from dbt.contracts.graph.model_config import BaseConfig
+from dbt.contracts.graph.manifest import Manifest
+from dbt.contracts.relation import Policy, HasQuoting
+
+from dbt.graph import Graph
+
+
+@dataclass
+class AdapterConfig(BaseConfig):
+    pass
+
+
+class ConnectionManagerProtocol(Protocol):
+    TYPE: str
+
+
+class ColumnProtocol(Protocol):
+    pass
+
+
+Self = TypeVar('Self', bound='RelationProtocol')
+
+
+class RelationProtocol(Protocol):
+    @classmethod
+    def get_default_quote_policy(cls) -> Policy:
+        ...
+
+    @classmethod
+    def create_from(
+        cls: Type[Self],
+        config: HasQuoting,
+        node: Union[CompiledNode, ParsedNode, ParsedSourceDefinition],
+    ) -> Self:
+        ...
+
+
+class CompilerProtocol(Protocol):
+    def compile(self, manifest: Manifest, write=True) -> Graph:
+        ...
+
+    def compile_node(
+        self,
+        node: ManifestNode,
+        manifest: Manifest,
+        extra_context: Optional[Dict[str, Any]] = None,
+    ) -> NonSourceCompiledNode:
+        ...
+
+
+AdapterConfig_T = TypeVar(
+    'AdapterConfig_T', bound=AdapterConfig
+)
+ConnectionManager_T = TypeVar(
+    'ConnectionManager_T', bound=ConnectionManagerProtocol
+)
+Relation_T = TypeVar(
+    'Relation_T', bound=RelationProtocol
+)
+Column_T = TypeVar(
+    'Column_T', bound=ColumnProtocol
+)
+Compiler_T = TypeVar('Compiler_T', bound=CompilerProtocol)
+
+
+class AdapterProtocol(
+    Protocol,
+    Generic[
+        AdapterConfig_T,
+        ConnectionManager_T,
+        Relation_T,
+        Column_T,
+        Compiler_T,
+    ]
+):
+    AdapterSpecificConfigs: ClassVar[Type[AdapterConfig_T]]
+    Column: ClassVar[Type[Column_T]]
+    Relation: ClassVar[Type[Relation_T]]
+    ConnectionManager: ClassVar[Type[ConnectionManager_T]]
+    connections: ConnectionManager_T
+
+    def __init__(self, config: AdapterRequiredConfig):
+        ...
+
+    @classmethod
+    def type(cls) -> str:
+        pass
+
+    def set_query_header(self, manifest: Manifest) -> None:
+        ...
+
+    @staticmethod
+    def get_thread_identifier() -> Hashable:
+        ...
+
+    def get_thread_connection(self) -> Connection:
+        ...
+
+    def set_thread_connection(self, conn: Connection) -> None:
+        ...
+
+    def get_if_exists(self) -> Optional[Connection]:
+        ...
+
+    def clear_thread_connection(self) -> None:
+        ...
+
+    def clear_transaction(self) -> None:
+        ...
+
+    def exception_handler(self, sql: str) -> ContextManager:
+        ...
+
+    def set_connection_name(self, name: Optional[str] = None) -> Connection:
+        ...
+
+    def cancel_open(self) -> Optional[List[str]]:
+        ...
+
+    def open(cls, connection: Connection) -> Connection:
+        ...
+
+    def release(self) -> None:
+        ...
+
+    def cleanup_all(self) -> None:
+        ...
+
+    def begin(self) -> None:
+        ...
+
+    def commit(self) -> None:
+        ...
+
+    def close(cls, connection: Connection) -> Connection:
+        ...
+
+    def commit_if_has_connection(self) -> None:
+        ...
+
+    def execute(
+        self, sql: str, auto_begin: bool = False, fetch: bool = False
+    ) -> Tuple[Union[str, AdapterResponse], agate.Table]:
+        ...
+
+    def get_compiler(self) -> Compiler_T:
+        ...

core/dbt/adapters/sql/connections.py

@@ -1,12 +1,17 @@
 import abc
 import time
+from typing import List, Optional, Tuple, Any, Iterable, Dict, Union
+
+import agate
 
 import dbt.clients.agate_helper
 import dbt.exceptions
-from dbt.contracts.connection import Connection
 from dbt.adapters.base import BaseConnectionManager
-from dbt.compat import abstractclassmethod
+from dbt.contracts.connection import (
+    Connection, ConnectionState, AdapterResponse
+)
 from dbt.logger import GLOBAL_LOGGER as logger
+from dbt import flags
 
 
 class SQLConnectionManager(BaseConnectionManager):
@@ -15,20 +20,17 @@ class SQLConnectionManager(BaseConnectionManager):
     Methods to implement:
         - exception_handler
         - cancel
-        - get_status
+        - get_response
         - open
     """
     @abc.abstractmethod
-    def cancel(self, connection):
-        """Cancel the given connection.
-
-        :param Connection connection: The connection to cancel.
-        """
+    def cancel(self, connection: Connection):
+        """Cancel the given connection."""
         raise dbt.exceptions.NotImplementedException(
             '`cancel` is not implemented for this adapter!'
         )
 
-    def cancel_open(self):
+    def cancel_open(self) -> List[str]:
         names = []
         this_connection = self.get_if_exists()
         with self.lock:
@@ -36,12 +38,24 @@ class SQLConnectionManager(BaseConnectionManager):
                 if connection is this_connection:
                     continue
 
-                self.cancel(connection)
-                names.append(connection.name)
+                # if the connection failed, the handle will be None so we have
+                # nothing to cancel.
+                if (
+                    connection.handle is not None and
+                    connection.state == ConnectionState.OPEN
+                ):
+                    self.cancel(connection)
+                if connection.name is not None:
+                    names.append(connection.name)
         return names
 
-    def add_query(self, sql, auto_begin=True, bindings=None,
-                  abridge_sql_log=False):
+    def add_query(
+        self,
+        sql: str,
+        auto_begin: bool = True,
+        bindings: Optional[Any] = None,
+        abridge_sql_log: bool = False
+    ) -> Tuple[Connection, Any]:
         connection = self.get_thread_connection()
         if auto_begin and connection.transaction_open is False:
             self.begin()
@@ -51,52 +65,69 @@ class SQLConnectionManager(BaseConnectionManager):
 
         with self.exception_handler(sql):
             if abridge_sql_log:
-                logger.debug('On %s: %s....', connection.name, sql[0:512])
+                log_sql = '{}...'.format(sql[:512])
             else:
-                logger.debug('On %s: %s', connection.name, sql)
+                log_sql = sql
+
+            logger.debug(
+                'On {connection_name}: {sql}',
+                connection_name=connection.name,
+                sql=log_sql,
+            )
             pre = time.time()
 
             cursor = connection.handle.cursor()
             cursor.execute(sql, bindings)
-
-            logger.debug("SQL status: %s in %0.2f seconds",
-                         self.get_status(cursor), (time.time() - pre))
+            logger.debug(
+                "SQL status: {status} in {elapsed:0.2f} seconds",
+                status=self.get_response(cursor),
+                elapsed=(time.time() - pre)
+            )
 
             return connection, cursor
 
-    @abstractclassmethod
-    def get_status(cls, cursor):
-        """Get the status of the cursor.
-
-        :param cursor: A database handle to get status from
-        :return: The current status
-        :rtype: str
-        """
+    @abc.abstractclassmethod
+    def get_response(cls, cursor: Any) -> Union[AdapterResponse, str]:
+        """Get the status of the cursor."""
         raise dbt.exceptions.NotImplementedException(
-            '`get_status` is not implemented for this adapter!'
+            '`get_response` is not implemented for this adapter!'
         )
 
     @classmethod
-    def get_result_from_cursor(cls, cursor):
-        data = []
-        column_names = []
+    def process_results(
+        cls,
+        column_names: Iterable[str],
+        rows: Iterable[Any]
+    ) -> List[Dict[str, Any]]:
+
+        return [dict(zip(column_names, row)) for row in rows]
+
+    @classmethod
+    def get_result_from_cursor(cls, cursor: Any) -> agate.Table:
+        data: List[Any] = []
+        column_names: List[str] = []
 
         if cursor.description is not None:
             column_names = [col[0] for col in cursor.description]
-            raw_results = cursor.fetchall()
-            data = [dict(zip(column_names, row))
-                    for row in raw_results]
+            rows = cursor.fetchall()
+            data = cls.process_results(column_names, rows)
 
-        return dbt.clients.agate_helper.table_from_data(data, column_names)
+        return dbt.clients.agate_helper.table_from_data_flat(
+            data,
+            column_names
+        )
 
-    def execute(self, sql, auto_begin=False, fetch=False):
+    def execute(
+        self, sql: str, auto_begin: bool = False, fetch: bool = False
+    ) -> Tuple[Union[AdapterResponse, str], agate.Table]:
+        sql = self._add_query_comment(sql)
         _, cursor = self.add_query(sql, auto_begin)
-        status = self.get_status(cursor)
+        response = self.get_response(cursor)
         if fetch:
             table = self.get_result_from_cursor(cursor)
         else:
             table = dbt.clients.agate_helper.empty_table()
-        return status, table
+        return response, table
 
     def add_begin_query(self):
         return self.add_query('BEGIN', auto_begin=False)
@@ -107,13 +138,16 @@ class SQLConnectionManager(BaseConnectionManager):
     def begin(self):
         connection = self.get_thread_connection()
 
-        if dbt.flags.STRICT_MODE:
-            assert isinstance(connection, 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 '
-                'it already had one open!'.format(connection.get('name')))
+                'it already had one open!'.format(connection.name))
 
         self.add_begin_query()
 
@@ -122,8 +156,11 @@ class SQLConnectionManager(BaseConnectionManager):
 
     def commit(self):
         connection = self.get_thread_connection()
-        if dbt.flags.STRICT_MODE:
-            assert isinstance(connection, 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(

core/dbt/adapters/sql/impl.py

@@ -1,11 +1,14 @@
 import agate
+from typing import Any, Optional, Tuple, Type, List
 
 import dbt.clients.agate_helper
+from dbt.contracts.connection import Connection
 import dbt.exceptions
-import dbt.flags
 from dbt.adapters.base import BaseAdapter, available
+from dbt.adapters.sql import SQLConnectionManager
 from dbt.logger import GLOBAL_LOGGER as logger
 
+from dbt.adapters.base.relation import BaseRelation
 
 LIST_RELATIONS_MACRO_NAME = 'list_relations_without_caching'
 GET_COLUMNS_IN_RELATION_MACRO_NAME = 'get_columns_in_relation'
@@ -35,50 +38,64 @@ class SQLAdapter(BaseAdapter):
         - list_relations_without_caching
         - get_columns_in_relation
     """
+
+    ConnectionManager: Type[SQLConnectionManager]
+    connections: SQLConnectionManager
+
     @available.parse(lambda *a, **k: (None, None))
-    def add_query(self, sql, auto_begin=True, bindings=None,
-                  abridge_sql_log=False):
+    def add_query(
+        self,
+        sql: str,
+        auto_begin: bool = True,
+        bindings: Optional[Any] = None,
+        abridge_sql_log: bool = False,
+    ) -> Tuple[Connection, Any]:
         """Add a query to the current transaction. A thin wrapper around
         ConnectionManager.add_query.
 
-        :param str sql: The SQL query to add
-        :param bool auto_begin: If set and there is no transaction in progress,
+        :param sql: The SQL query to add
+        :param auto_begin: If set and there is no transaction in progress,
             begin a new one.
-        :param Optional[List[object]]: An optional list of bindings for the
-            query.
-        :param bool abridge_sql_log: If set, limit the raw sql logged to 512
+        :param bindings: An optional list of bindings for the query.
+        :param abridge_sql_log: If set, limit the raw sql logged to 512
             characters
         """
         return self.connections.add_query(sql, auto_begin, bindings,
                                           abridge_sql_log)
 
     @classmethod
-    def convert_text_type(cls, agate_table, col_idx):
+    def convert_text_type(cls, agate_table: agate.Table, col_idx: int) -> str:
         return "text"
 
     @classmethod
-    def convert_number_type(cls, agate_table, col_idx):
+    def convert_number_type(
+        cls, agate_table: agate.Table, col_idx: int
+    ) -> str:
         decimals = agate_table.aggregate(agate.MaxPrecision(col_idx))
         return "float8" if decimals else "integer"
 
     @classmethod
-    def convert_boolean_type(cls, agate_table, col_idx):
+    def convert_boolean_type(
+            cls, agate_table: agate.Table, col_idx: int
+    ) -> str:
         return "boolean"
 
     @classmethod
-    def convert_datetime_type(cls, agate_table, col_idx):
+    def convert_datetime_type(
+            cls, agate_table: agate.Table, col_idx: int
+    ) -> str:
         return "timestamp without time zone"
 
     @classmethod
-    def convert_date_type(cls, agate_table, col_idx):
+    def convert_date_type(cls, agate_table: agate.Table, col_idx: int) -> str:
         return "date"
 
     @classmethod
-    def convert_time_type(cls, agate_table, col_idx):
+    def convert_time_type(cls, agate_table: agate.Table, col_idx: int) -> str:
         return "time"
 
     @classmethod
-    def is_cancelable(cls):
+    def is_cancelable(cls) -> bool:
         return True
 
     def expand_column_types(self, goal, current):
@@ -99,12 +116,14 @@ 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 %s to %s in table %s",
+                logger.debug("Changing col type from {} to {} in table {}",
                              target_column.data_type, new_type, current)
 
                 self.alter_column_type(current, column_name, new_type)
 
-    def alter_column_type(self, relation, column_name, new_column_type):
+    def alter_column_type(
+            self, relation, column_name, new_column_type
+    ) -> None:
         """
         1. Create a new column (w/ temp name and correct type)
         2. Copy data over to it
@@ -122,13 +141,12 @@ class SQLAdapter(BaseAdapter):
         )
 
     def drop_relation(self, relation):
-        if dbt.flags.USE_CACHE:
-            self.cache.drop(relation)
         if relation.type is None:
             dbt.exceptions.raise_compiler_error(
                 'Tried to drop relation {}, but its type is null.'
                 .format(relation))
 
+        self.cache_dropped(relation)
         self.execute_macro(
             DROP_RELATION_MACRO_NAME,
             kwargs={'relation': relation}
@@ -141,8 +159,7 @@ class SQLAdapter(BaseAdapter):
         )
 
     def rename_relation(self, from_relation, to_relation):
-        if dbt.flags.USE_CACHE:
-            self.cache.rename(from_relation, to_relation)
+        self.cache_renamed(from_relation, to_relation)
 
         kwargs = {'from_relation': from_relation, 'to_relation': to_relation}
         self.execute_macro(
@@ -156,26 +173,31 @@ class SQLAdapter(BaseAdapter):
             kwargs={'relation': relation}
         )
 
-    def create_schema(self, database, schema):
-        logger.debug('Creating schema "%s"."%s".', database, schema)
+    def create_schema(self, relation: BaseRelation) -> None:
+        relation = relation.without_identifier()
+        logger.debug('Creating schema "{}"', relation)
         kwargs = {
-            'database_name': self.quote_as_configured(database, 'database'),
-            'schema_name': self.quote_as_configured(schema, 'schema'),
+            'relation': relation,
         }
         self.execute_macro(CREATE_SCHEMA_MACRO_NAME, kwargs=kwargs)
         self.commit_if_has_connection()
+        # we can't update the cache here, as if the schema already existed we
+        # don't want to (incorrectly) say that it's empty
 
-    def drop_schema(self, database, schema):
-        logger.debug('Dropping schema "%s"."%s".', database, schema)
+    def drop_schema(self, relation: BaseRelation) -> None:
+        relation = relation.without_identifier()
+        logger.debug('Dropping schema "{}".', relation)
         kwargs = {
-            'database_name': self.quote_as_configured(database, 'database'),
-            'schema_name': self.quote_as_configured(schema, 'schema'),
+            'relation': relation,
         }
-        self.execute_macro(DROP_SCHEMA_MACRO_NAME,
-                           kwargs=kwargs)
+        self.execute_macro(DROP_SCHEMA_MACRO_NAME, kwargs=kwargs)
+        # we can update the cache here
+        self.cache.drop_schema(relation.database, relation.schema)
 
-    def list_relations_without_caching(self, information_schema, schema):
-        kwargs = {'information_schema': information_schema, 'schema': schema}
+    def list_relations_without_caching(
+        self, schema_relation: BaseRelation,
+    ) -> List[BaseRelation]:
+        kwargs = {'schema_relation': schema_relation}
         results = self.execute_macro(
             LIST_RELATIONS_MACRO_NAME,
             kwargs=kwargs
@@ -188,6 +210,10 @@ class SQLAdapter(BaseAdapter):
             'identifier': True
         }
         for _database, name, _schema, _type in results:
+            try:
+                _type = self.Relation.get_relation_type(_type)
+            except ValueError:
+                _type = self.Relation.External
             relations.append(self.Relation.create(
                 database=_database,
                 schema=_schema,
@@ -197,10 +223,10 @@ class SQLAdapter(BaseAdapter):
             ))
         return relations
 
-    def quote(cls, identifier):
+    def quote(self, identifier):
         return '"{}"'.format(identifier)
 
-    def list_schemas(self, database):
+    def list_schemas(self, database: str) -> List[str]:
         results = self.execute_macro(
             LIST_SCHEMAS_MACRO_NAME,
             kwargs={'database': database}
@@ -208,9 +234,11 @@ class SQLAdapter(BaseAdapter):
 
         return [row[0] for row in results]
 
-    def check_schema_exists(self, database, schema):
+    def check_schema_exists(self, database: str, schema: str) -> bool:
         information_schema = self.Relation.create(
-            database=database, schema=schema,
+            database=database,
+            schema=schema,
+            identifier='INFORMATION_SCHEMA',
             quote_policy=self.config.quoting
         ).information_schema()
 

core/dbt/api/__init__.py

@@ -1,5 +0,0 @@
-from dbt.api.object import APIObject
-
-__all__ = [
-    'APIObject'
-]

core/dbt/api/object.py

@@ -1,125 +0,0 @@
-import copy
-from collections import Mapping
-from jsonschema import Draft7Validator
-
-from dbt.exceptions import JSONValidationException
-from dbt.utils import deep_merge
-from dbt.clients.system import write_json
-
-
-class APIObject(Mapping):
-    """
-    A serializable / deserializable object intended for
-    use in a future dbt API.
-
-    To create a new object, you'll want to extend this
-    class, and then implement the SCHEMA property (a
-    valid JSON schema), the DEFAULTS property (default
-    settings for this object), and a static method that
-    calls this constructor.
-    """
-
-    SCHEMA = {
-        'type': 'object',
-        'properties': {}
-    }
-
-    DEFAULTS = {}
-
-    def __init__(self, **kwargs):
-        """
-        Create and validate an instance. Note that if you override this, you
-        will want to do so by modifying kwargs and only then calling
-        super(NewClass, self).__init__(**kwargs).
-        """
-        super(APIObject, self).__init__()
-        # note: deep_merge does a deep copy on its arguments.
-        self._contents = deep_merge(self.DEFAULTS, kwargs)
-        self.validate()
-
-    def __str__(self):
-        return '{}(**{})'.format(self.__class__.__name__, self._contents)
-
-    def __repr__(self):
-        return '{}(**{})'.format(self.__class__.__name__, self._contents)
-
-    def __eq__(self, other):
-        if not isinstance(other, self.__class__):
-            return False
-        return self.serialize() == other.serialize()
-
-    def incorporate(self, **kwargs):
-        """
-        Given a list of kwargs, incorporate these arguments
-        into a new copy of this instance, and return the new
-        instance after validating.
-        """
-        return type(self)(**deep_merge(self._contents, kwargs))
-
-    def serialize(self):
-        """
-        Return a dict representation of this object.
-        """
-        return copy.deepcopy(self._contents)
-
-    def write(self, path):
-        write_json(path, self.serialize())
-
-    @classmethod
-    def deserialize(cls, settings):
-        """
-        Convert a dict representation of this object into
-        an actual object for internal use.
-        """
-        return cls(**settings)
-
-    def validate(self):
-        """
-        Using the SCHEMA property, validate the attributes
-        of this instance. If any attributes are missing or
-        invalid, raise a ValidationException.
-        """
-        validator = Draft7Validator(self.SCHEMA)
-
-        errors = set()  # make errors a set to avoid duplicates
-
-        for error in validator.iter_errors(self.serialize()):
-            errors.add('.'.join(
-                list(map(str, error.path)) + [error.message]
-            ))
-
-        if errors:
-            raise JSONValidationException(type(self).__name__, errors)
-
-    # implement the Mapping protocol:
-    # https://docs.python.org/3/library/collections.abc.html
-    def __getitem__(self, key):
-        return self._contents[key]
-
-    def __iter__(self):
-        return self._contents.__iter__()
-
-    def __len__(self):
-        return self._contents.__len__()
-
-    # implement this because everyone always expects it.
-    def get(self, key, default=None):
-        try:
-            return self[key]
-        except KeyError:
-            return default
-
-    def set(self, key, value):
-        self._contents[key] = value
-
-    # most users of APIObject also expect the attributes to be available via
-    # dot-notation because the previous implementation assigned to __dict__.
-    # we should consider removing this if we fix all uses to have properties.
-    def __getattr__(self, name):
-        if name != '_contents' and name in self._contents:
-            return self._contents[name]
-        elif hasattr(self.__class__, name):
-            return getattr(self.__class__, name)
-        raise AttributeError((
-            "'{}' object has no attribute '{}'"
-        ).format(type(self).__name__, name))

core/dbt/clients/_jinja_blocks.py

@@ -8,7 +8,7 @@ def regex(pat):
     return re.compile(pat, re.DOTALL | re.MULTILINE)
 
 
-class BlockData(object):
+class BlockData:
     """raw plaintext data from the top level of the file."""
     def __init__(self, contents):
         self.block_type_name = '__dbt__data'
@@ -16,7 +16,7 @@ class BlockData(object):
         self.full_block = contents
 
 
-class BlockTag(object):
+class BlockTag:
     def __init__(self, block_type_name, block_name, contents=None,
                  full_block=None, **kw):
         self.block_type_name = block_type_name
@@ -69,7 +69,7 @@ BLOCK_START_PATTERN = regex(''.join((
 
 RAW_BLOCK_PATTERN = regex(''.join((
     r'(?:\s*\{\%\-|\{\%)\s*raw\s*(?:\-\%\}\s*|\%\})',
-    r'(?:.*)',
+    r'(?:.*?)',
     r'(?:\s*\{\%\-|\{\%)\s*endraw\s*(?:\-\%\}\s*|\%\})',
 )))
 
@@ -85,13 +85,25 @@ STRING_PATTERN = regex(
 QUOTE_START_PATTERN = regex(r'''(?P<quote>(['"]))''')
 
 
-class TagIterator(object):
+class TagIterator:
     def __init__(self, data):
         self.data = data
         self.blocks = []
         self._parenthesis_stack = []
         self.pos = 0
 
+    def linepos(self, end=None) -> str:
+        """Given an absolute position in the input data, return a pair of
+        line number + relative position to the start of the line.
+        """
+        end_val: int = self.pos if end is None else end
+        data = self.data[:end_val]
+        # if not found, rfind returns -1, and -1+1=0, which is perfect!
+        last_line_start = data.rfind('\n') + 1
+        # it's easy to forget this, but line numbers are 1-indexed
+        line_number = data.count('\n') + 1
+        return f'{line_number}:{end_val - last_line_start}'
+
     def advance(self, new_position):
         self.pos = new_position
 
@@ -278,7 +290,7 @@ _CONTROL_FLOW_END_TAGS = {
 }
 
 
-class BlockIterator(object):
+class BlockIterator:
     def __init__(self, data):
         self.tag_parser = TagIterator(data)
         self.current = None
@@ -320,20 +332,28 @@ class BlockIterator(object):
                     dbt.exceptions.raise_compiler_error((
                         'Got an unexpected control flow end tag, got {} but '
                         'never saw a preceeding {} (@ {})'
-                    ).format(tag.block_type_name, expected, tag.start))
+                    ).format(
+                        tag.block_type_name,
+                        expected,
+                        self.tag_parser.linepos(tag.start)
+                    ))
                 expected = _CONTROL_FLOW_TAGS[found]
                 if expected != tag.block_type_name:
                     dbt.exceptions.raise_compiler_error((
                         'Got an unexpected control flow end tag, got {} but '
                         'expected {} next (@ {})'
-                    ).format(tag.block_type_name, expected, tag.start))
+                    ).format(
+                        tag.block_type_name,
+                        expected,
+                        self.tag_parser.linepos(tag.start)
+                    ))
 
             if tag.block_type_name in allowed_blocks:
                 if self.stack:
                     dbt.exceptions.raise_compiler_error((
                         'Got a block definition inside control flow at {}. '
                         'All dbt block definitions must be at the top level'
-                    ).format(tag.start))
+                    ).format(self.tag_parser.linepos(tag.start)))
                 if self.current is not None:
                     dbt.exceptions.raise_compiler_error(
                         duplicate_tags.format(outer=self.current, inner=tag)
@@ -347,6 +367,7 @@ class BlockIterator(object):
 
             elif self.is_current_end(tag):
                 self.last_position = tag.end
+                assert self.current is not None
                 yield BlockTag(
                     block_type_name=self.current.block_type_name,
                     block_name=self.current.block_name,
@@ -356,10 +377,11 @@ class BlockIterator(object):
                 self.current = None
 
         if self.current:
+            linecount = self.data[:self.current.end].count('\n') + 1
             dbt.exceptions.raise_compiler_error((
-                'Reached EOF without finding a close block for '
-                '{0.block_type_name} (from {0.end})'
-            ).format(self.current))
+                'Reached EOF without finding a close tag for '
+                '{} (searched from line {})'
+            ).format(self.current.block_type_name, linecount))
 
         if collect_raw_data:
             raw_data = self.data[self.last_position:]

core/dbt/clients/agate_helper.py

@@ -1,24 +1,76 @@
 from codecs import BOM_UTF8
 
-import dbt.compat
-
 import agate
+import datetime
+import isodate
+import json
+import dbt.utils
+from typing import Iterable, List, Dict, Union, Optional, Any
+
+from dbt.exceptions import RuntimeException
+
 
 BOM = BOM_UTF8.decode('utf-8')  # '\ufeff'
 
-DEFAULT_TYPE_TESTER = agate.TypeTester(types=[
-    agate.data_types.Number(null_values=('null', '')),
-    agate.data_types.TimeDelta(null_values=('null', '')),
-    agate.data_types.Date(null_values=('null', '')),
-    agate.data_types.DateTime(null_values=('null', '')),
-    agate.data_types.Boolean(true_values=('true',),
-                             false_values=('false',),
-                             null_values=('null', '')),
-    agate.data_types.Text(null_values=('null', ''))
-])
+
+class ISODateTime(agate.data_types.DateTime):
+    def cast(self, d):
+        # this is agate.data_types.DateTime.cast with the "clever" bits removed
+        # so we only handle ISO8601 stuff
+        if isinstance(d, datetime.datetime) or d is None:
+            return d
+        elif isinstance(d, datetime.date):
+            return datetime.datetime.combine(d, datetime.time(0, 0, 0))
+        elif isinstance(d, str):
+            d = d.strip()
+            if d.lower() in self.null_values:
+                return None
+        try:
+            return isodate.parse_datetime(d)
+        except:  # noqa
+            pass
+
+        raise agate.exceptions.CastError(
+            'Can not parse value "%s" as datetime.' % d
+        )
 
 
-def table_from_data(data, column_names):
+def build_type_tester(text_columns: Iterable[str]) -> agate.TypeTester:
+    types = [
+        agate.data_types.Number(null_values=('null', '')),
+        agate.data_types.Date(null_values=('null', ''),
+                              date_format='%Y-%m-%d'),
+        agate.data_types.DateTime(null_values=('null', ''),
+                                  datetime_format='%Y-%m-%d %H:%M:%S'),
+        ISODateTime(null_values=('null', '')),
+        agate.data_types.Boolean(true_values=('true',),
+                                 false_values=('false',),
+                                 null_values=('null', '')),
+        agate.data_types.Text(null_values=('null', ''))
+    ]
+    force = {
+        k: agate.data_types.Text(null_values=('null', ''))
+        for k in text_columns
+    }
+    return agate.TypeTester(force=force, types=types)
+
+
+DEFAULT_TYPE_TESTER = build_type_tester(())
+
+
+def table_from_rows(
+    rows: List[Any],
+    column_names: Iterable[str],
+    text_only_columns: Optional[Iterable[str]] = None,
+) -> agate.Table:
+    if text_only_columns is None:
+        column_types = DEFAULT_TYPE_TESTER
+    else:
+        column_types = build_type_tester(text_only_columns)
+    return agate.Table(rows, column_names, column_types=column_types)
+
+
+def table_from_data(data, column_names: Iterable[str]) -> agate.Table:
     "Convert list of dictionaries into an Agate table"
 
     # The agate table is generated from a list of dicts, so the column order
@@ -33,6 +85,22 @@ def table_from_data(data, column_names):
         return table.select(column_names)
 
 
+def table_from_data_flat(data, column_names: Iterable[str]) -> agate.Table:
+    "Convert list of dictionaries into an Agate table"
+
+    rows = []
+    for _row in data:
+        row = []
+        for value in list(_row.values()):
+            if isinstance(value, (dict, list, tuple)):
+                row.append(json.dumps(value, cls=dbt.utils.JSONEncoder))
+            else:
+                row.append(value)
+        rows.append(row)
+
+    return table_from_rows(rows=rows, column_names=column_names)
+
+
 def empty_table():
     "Returns an empty Agate table. To be used in place of None"
 
@@ -45,8 +113,91 @@ def as_matrix(table):
     return [r.values() for r in table.rows.values()]
 
 
-def from_csv(abspath):
-    with dbt.compat.open_file(abspath) as fp:
+def from_csv(abspath, text_columns):
+    type_tester = build_type_tester(text_columns=text_columns)
+    with open(abspath, encoding='utf-8') as fp:
         if fp.read(1) != BOM:
             fp.seek(0)
-        return agate.Table.from_csv(fp, column_types=DEFAULT_TYPE_TESTER)
+        return agate.Table.from_csv(fp, column_types=type_tester)
+
+
+class _NullMarker:
+    pass
+
+
+NullableAgateType = Union[agate.data_types.DataType, _NullMarker]
+
+
+class ColumnTypeBuilder(Dict[str, NullableAgateType]):
+    def __init__(self):
+        super().__init__()
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            super().__setitem__(key, value)
+            return
+
+        existing_type = self[key]
+        if isinstance(existing_type, _NullMarker):
+            # overwrite
+            super().__setitem__(key, value)
+        elif isinstance(value, _NullMarker):
+            # use the existing value
+            return
+        elif not isinstance(value, type(existing_type)):
+            # actual type mismatch!
+            raise RuntimeException(
+                f'Tables contain columns with the same names ({key}), '
+                f'but different types ({value} vs {existing_type})'
+            )
+
+    def finalize(self) -> Dict[str, agate.data_types.DataType]:
+        result: Dict[str, agate.data_types.DataType] = {}
+        for key, value in self.items():
+            if isinstance(value, _NullMarker):
+                # this is what agate would do.
+                result[key] = agate.data_types.Number()
+            else:
+                result[key] = value
+        return result
+
+
+def _merged_column_types(
+    tables: List[agate.Table]
+) -> Dict[str, agate.data_types.DataType]:
+    # this is a lot like agate.Table.merge, but with handling for all-null
+    # rows being "any type".
+    new_columns: ColumnTypeBuilder = ColumnTypeBuilder()
+    for table in tables:
+        for i in range(len(table.columns)):
+            column_name: str = table.column_names[i]
+            column_type: NullableAgateType = table.column_types[i]
+            # avoid over-sensitive type inference
+            if all(x is None for x in table.columns[column_name]):
+                column_type = _NullMarker()
+            new_columns[column_name] = column_type
+
+    return new_columns.finalize()
+
+
+def merge_tables(tables: List[agate.Table]) -> agate.Table:
+    """This is similar to agate.Table.merge, but it handles rows of all 'null'
+    values more gracefully during merges.
+    """
+    new_columns = _merged_column_types(tables)
+    column_names = tuple(new_columns.keys())
+    column_types = tuple(new_columns.values())
+
+    rows: List[agate.Row] = []
+    for table in tables:
+        if (
+            table.column_names == column_names and
+            table.column_types == column_types
+        ):
+            rows.extend(table.rows)
+        else:
+            for row in table.rows:
+                data = [row.get(name, None) for name in column_names]
+                rows.append(agate.Row(data, column_names))
+    # _is_fork to tell agate that we already made things into `Row`s.
+    return agate.Table(rows, column_names, column_types, _is_fork=True)

core/dbt/clients/git.py

@@ -6,8 +6,13 @@ from dbt.logger import GLOBAL_LOGGER as logger
 import dbt.exceptions
 
 
-def clone(repo, cwd, dirname=None, remove_git_dir=False):
-    clone_cmd = ['git', 'clone', '--depth', '1', repo]
+def clone(repo, cwd, dirname=None, remove_git_dir=False, branch=None):
+    clone_cmd = ['git', 'clone', '--depth', '1']
+
+    if branch is not None:
+        clone_cmd.extend(['--branch', branch])
+
+    clone_cmd.append(repo)
 
     if dirname is not None:
         clone_cmd.append(dirname)
@@ -81,21 +86,25 @@ def clone_and_checkout(repo, cwd, dirname=None, remove_git_dir=False,
     start_sha = None
     if exists:
         directory = exists.group(1)
-        logger.debug('Updating existing dependency %s.', directory)
+        logger.debug('Updating existing dependency {}.', directory)
     else:
         matches = re.match("Cloning into '(.+)'", err.decode('utf-8'))
+        if matches is None:
+            raise dbt.exceptions.RuntimeException(
+                f'Error cloning {repo} - never saw "Cloning into ..." from git'
+            )
         directory = matches.group(1)
-        logger.debug('Pulling new dependency %s.', directory)
+        logger.debug('Pulling new dependency {}.', directory)
     full_path = os.path.join(cwd, directory)
     start_sha = get_current_sha(full_path)
     checkout(full_path, repo, branch)
     end_sha = get_current_sha(full_path)
     if exists:
         if start_sha == end_sha:
-            logger.debug('  Already at %s, nothing to do.', start_sha[:7])
+            logger.debug('  Already at {}, nothing to do.', start_sha[:7])
         else:
-            logger.debug('  Updated checkout from %s to %s.',
+            logger.debug('  Updated checkout from {} to {}.',
                          start_sha[:7], end_sha[:7])
     else:
-        logger.debug('  Checked out at %s.', end_sha[:7])
+        logger.debug('  Checked out at {}.', end_sha[:7])
     return directory

core/dbt/clients/jinja.py

@@ -1,23 +1,71 @@
 import codecs
 import linecache
 import os
+import re
+import tempfile
+import threading
+from ast import literal_eval
+from contextlib import contextmanager
+from itertools import chain, islice
+from typing import (
+    List, Union, Set, Optional, Dict, Any, Iterator, Type, NoReturn, Tuple,
+    Callable
+)
 
 import jinja2
-import jinja2._compat
 import jinja2.ext
+import jinja2.nativetypes  # type: ignore
 import jinja2.nodes
 import jinja2.parser
 import jinja2.sandbox
 
-import dbt.compat
-import dbt.exceptions
-import dbt.utils
-
-from dbt.clients._jinja_blocks import BlockIterator
+from dbt.utils import (
+    get_dbt_macro_name, get_docs_macro_name, get_materialization_macro_name,
+    deep_map
+)
 
+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.exceptions import (
+    InternalException, raise_compiler_error, CompilationException,
+    invalid_materialization_argument, MacroReturn, JinjaRenderingException
+)
+from dbt import flags
 from dbt.logger import GLOBAL_LOGGER as logger  # noqa
 
 
+def _linecache_inject(source, write):
+    if write:
+        # this is the only reliable way to accomplish this. Obviously, it's
+        # really darn noisy and will fill your temporary directory
+        tmp_file = tempfile.NamedTemporaryFile(
+            prefix='dbt-macro-compiled-',
+            suffix='.py',
+            delete=False,
+            mode='w+',
+            encoding='utf-8',
+        )
+        tmp_file.write(source)
+        filename = tmp_file.name
+    else:
+        # `codecs.encode` actually takes a `bytes` as the first argument if
+        # the second argument is 'hex' - mypy does not know this.
+        rnd = codecs.encode(os.urandom(12), 'hex')  # type: ignore
+        filename = rnd.decode('ascii')
+
+    # put ourselves in the cache
+    cache_entry = (
+        len(source),
+        None,
+        [line + '\n' for line in source.splitlines()],
+        filename
+    )
+    # linecache does in fact have an attribute `cache`, thanks
+    linecache.cache[filename] = cache_entry  # type: ignore
+    return filename
+
+
 class MacroFuzzParser(jinja2.parser.Parser):
     def parse_macro(self):
         node = jinja2.nodes.Macro(lineno=next(self.stream).lineno)
@@ -25,7 +73,7 @@ class MacroFuzzParser(jinja2.parser.Parser):
         # modified to fuzz macros defined in the same file. this way
         # dbt can understand the stack of macros being called.
         #  - @cmcarthur
-        node.name = dbt.utils.get_dbt_macro_name(
+        node.name = get_dbt_macro_name(
             self.parse_assign_target(name_only=True).name)
 
         self.parse_signature(node)
@@ -36,51 +84,129 @@ class MacroFuzzParser(jinja2.parser.Parser):
 
 class MacroFuzzEnvironment(jinja2.sandbox.SandboxedEnvironment):
     def _parse(self, source, name, filename):
-        return MacroFuzzParser(
-            self, source, name,
-            jinja2._compat.encode_filename(filename)
-        ).parse()
+        return MacroFuzzParser(self, source, name, filename).parse()
 
     def _compile(self, source, filename):
         """Override jinja's compilation to stash the rendered source inside
-        the python linecache for debugging.
+        the python linecache for debugging when the appropriate environment
+        variable is set.
+
+        If the value is 'write', also write the files to disk.
+        WARNING: This can write a ton of data if you aren't careful.
         """
-        if filename == '<template>':
-            # make a better filename
-            filename = 'dbt-{}'.format(
-                codecs.encode(os.urandom(12), 'hex').decode('ascii')
+        if filename == '<template>' and flags.MACRO_DEBUGGING:
+            write = flags.MACRO_DEBUGGING == 'write'
+            filename = _linecache_inject(source, write)
+
+        return super()._compile(source, filename)  # type: ignore
+
+
+class NativeSandboxEnvironment(MacroFuzzEnvironment):
+    code_generator_class = jinja2.nativetypes.NativeCodeGenerator
+
+
+class TextMarker(str):
+    """A special native-env marker that indicates that a value is text and is
+    not to be evaluated. Use this to prevent your numbery-strings from becoming
+    numbers!
+    """
+
+
+class NativeMarker(str):
+    """A special native-env marker that indicates the field should be passed to
+    literal_eval.
+    """
+
+
+class BoolMarker(NativeMarker):
+    pass
+
+
+class NumberMarker(NativeMarker):
+    pass
+
+
+def _is_number(value) -> bool:
+    return isinstance(value, (int, float)) and not isinstance(value, bool)
+
+
+def quoted_native_concat(nodes):
+    """This is almost native_concat from the NativeTemplate, except in the
+    special case of a single argument that is a quoted string and returns a
+    string, the quotes are re-inserted.
+    """
+    head = list(islice(nodes, 2))
+
+    if not head:
+        return ''
+
+    if len(head) == 1:
+        raw = head[0]
+        if isinstance(raw, TextMarker):
+            return str(raw)
+        elif not isinstance(raw, NativeMarker):
+            # return non-strings as-is
+            return raw
+    else:
+        # multiple nodes become a string.
+        return "".join([str(v) for v in chain(head, nodes)])
+
+    try:
+        result = literal_eval(raw)
+    except (ValueError, SyntaxError, MemoryError):
+        result = raw
+    if isinstance(raw, BoolMarker) and not isinstance(result, bool):
+        raise JinjaRenderingException(
+            f"Could not convert value '{raw!s}' into type 'bool'"
+        )
+    if isinstance(raw, NumberMarker) and not _is_number(result):
+        raise JinjaRenderingException(
+            f"Could not convert value '{raw!s}' into type 'number'"
+        )
+
+    return result
+
+
+class NativeSandboxTemplate(jinja2.nativetypes.NativeTemplate):  # mypy: ignore
+    environment_class = NativeSandboxEnvironment
+
+    def render(self, *args, **kwargs):
+        """Render the template to produce a native Python type. If the
+        result is a single node, its value is returned. Otherwise, the
+        nodes are concatenated as strings. If the result can be parsed
+        with :func:`ast.literal_eval`, the parsed value is returned.
+        Otherwise, the string is returned.
+        """
+        vars = dict(*args, **kwargs)
+
+        try:
+            return quoted_native_concat(
+                self.root_render_func(self.new_context(vars))
             )
-            # encode, though I don't think this matters
-            filename = jinja2._compat.encode_filename(filename)
-            # put ourselves in the cache
-            linecache.cache[filename] = (
-                len(source),
-                None,
-                [line + '\n' for line in source.splitlines()],
-                filename
-            )
-
-        return super(MacroFuzzEnvironment, self)._compile(source, filename)
+        except Exception:
+            return self.environment.handle_exception()
 
 
-class TemplateCache(object):
+NativeSandboxEnvironment.template_class = NativeSandboxTemplate  # type: ignore
 
+
+class TemplateCache:
     def __init__(self):
-        self.file_cache = {}
+        self.file_cache: Dict[str, jinja2.Template] = {}
 
-    def get_node_template(self, node):
-        key = (node['package_name'], node['original_file_path'])
+    def get_node_template(self, node) -> jinja2.Template:
+        key = node.macro_sql
 
         if key in self.file_cache:
             return self.file_cache[key]
 
         template = get_template(
-            string=node.get('raw_sql'),
+            string=node.macro_sql,
             ctx={},
-            node=node
+            node=node,
         )
-        self.file_cache[key] = template
 
+        self.file_cache[key] = template
         return template
 
     def clear(self):
@@ -90,28 +216,138 @@ class TemplateCache(object):
 template_cache = TemplateCache()
 
 
-def macro_generator(node):
-    def apply_context(context):
-        def call(*args, **kwargs):
-            name = node.get('name')
-            template = template_cache.get_node_template(node)
-            module = template.make_module(context, False, context)
+class BaseMacroGenerator:
+    def __init__(self, context: Optional[Dict[str, Any]] = None) -> None:
+        self.context: Optional[Dict[str, Any]] = context
 
-            macro = module.__dict__[dbt.utils.get_dbt_macro_name(name)]
-            module.__dict__.update(context)
+    def get_template(self):
+        raise NotImplementedError('get_template not implemented!')
 
+    def get_name(self) -> str:
+        raise NotImplementedError('get_name not implemented!')
+
+    def get_macro(self):
+        name = self.get_name()
+        template = self.get_template()
+        # make the module. previously we set both vars and local, but that's
+        # redundant: They both end up in the same place
+        module = template.make_module(vars=self.context, shared=False)
+        macro = module.__dict__[get_dbt_macro_name(name)]
+        module.__dict__.update(self.context)
+        return macro
+
+    @contextmanager
+    def exception_handler(self) -> Iterator[None]:
+        try:
+            yield
+        except (TypeError, jinja2.exceptions.TemplateRuntimeError) as e:
+            raise_compiler_error(str(e))
+
+    def call_macro(self, *args, **kwargs):
+        if self.context is None:
+            raise InternalException(
+                'Context is still None in call_macro!'
+            )
+        assert self.context is not None
+
+        macro = self.get_macro()
+
+        with self.exception_handler():
             try:
                 return macro(*args, **kwargs)
-            except dbt.exceptions.MacroReturn as e:
+            except MacroReturn as e:
                 return e.value
-            except (TypeError, jinja2.exceptions.TemplateRuntimeError) as e:
-                dbt.exceptions.raise_compiler_error(str(e), node)
-            except dbt.exceptions.CompilationException as e:
-                e.stack.append(node)
-                raise e
 
-        return call
-    return apply_context
+
+class MacroStack(threading.local):
+    def __init__(self):
+        super().__init__()
+        self.call_stack = []
+
+    @property
+    def depth(self) -> int:
+        return len(self.call_stack)
+
+    def push(self, name):
+        self.call_stack.append(name)
+
+    def pop(self, name):
+        got = self.call_stack.pop()
+        if got != name:
+            raise InternalException(f'popped {got}, expected {name}')
+
+
+class MacroGenerator(BaseMacroGenerator):
+    def __init__(
+        self,
+        macro,
+        context: Optional[Dict[str, Any]] = None,
+        node: Optional[Any] = None,
+        stack: Optional[MacroStack] = None
+    ) -> None:
+        super().__init__(context)
+        self.macro = macro
+        self.node = node
+        self.stack = stack
+
+    def get_template(self):
+        return template_cache.get_node_template(self.macro)
+
+    def get_name(self) -> str:
+        return self.macro.name
+
+    @contextmanager
+    def exception_handler(self) -> Iterator[None]:
+        try:
+            yield
+        except (TypeError, jinja2.exceptions.TemplateRuntimeError) as e:
+            raise_compiler_error(str(e), self.macro)
+        except CompilationException as e:
+            e.stack.append(self.macro)
+            raise e
+
+    @contextmanager
+    def track_call(self):
+        if self.stack is None or self.node is None:
+            yield
+        else:
+            unique_id = self.macro.unique_id
+            depth = self.stack.depth
+            # only mark depth=0 as a dependency
+            if depth == 0:
+                self.node.depends_on.add_macro(unique_id)
+            self.stack.push(unique_id)
+            try:
+                yield
+            finally:
+                self.stack.pop(unique_id)
+
+    def __call__(self, *args, **kwargs):
+        with self.track_call():
+            return self.call_macro(*args, **kwargs)
+
+
+class QueryStringGenerator(BaseMacroGenerator):
+    def __init__(
+        self, template_str: str, context: Dict[str, Any]
+    ) -> None:
+        super().__init__(context)
+        self.template_str: str = template_str
+        env = get_environment()
+        self.template = env.from_string(
+            self.template_str,
+            globals=self.context,
+        )
+
+    def get_name(self) -> str:
+        return 'query_comment_macro'
+
+    def get_template(self):
+        """Don't use the template cache, we don't have a node"""
+        return self.template
+
+    def __call__(self, connection_name: str, node) -> str:
+        return str(self.call_macro(connection_name, node))
 
 
 class MaterializationExtension(jinja2.ext.Extension):
@@ -138,11 +374,13 @@ class MaterializationExtension(jinja2.ext.Extension):
                 adapter_name = value.value
 
             else:
-                dbt.exceptions.invalid_materialization_argument(
-                    materialization_name, target.name)
+                invalid_materialization_argument(
+                    materialization_name, target.name
+                )
 
-        node.name = dbt.utils.get_materialization_macro_name(
-            materialization_name, adapter_name)
+        node.name = get_materialization_macro_name(
+            materialization_name, adapter_name
+        )
 
         node.body = parser.parse_statements(('name:endmaterialization',),
                                             drop_needle=True)
@@ -159,7 +397,7 @@ class DocumentationExtension(jinja2.ext.Extension):
 
         node.args = []
         node.defaults = []
-        node.name = dbt.utils.get_docs_macro_name(docs_name)
+        node.name = get_docs_macro_name(docs_name)
         node.body = parser.parse_statements(('name:enddocs',),
                                             drop_needle=True)
         return node
@@ -169,38 +407,18 @@ def _is_dunder_name(name):
     return name.startswith('__') and name.endswith('__')
 
 
-def create_macro_capture_env(node):
-
-    class ParserMacroCapture(jinja2.Undefined):
-        """
-        This class sets up the parser to capture macros.
-        """
+def create_undefined(node=None):
+    class Undefined(jinja2.Undefined):
         def __init__(self, hint=None, obj=None, name=None, exc=None):
-            super(ParserMacroCapture, self).__init__(hint=hint, name=name)
+            super().__init__(hint=hint, name=name)
             self.node = node
             self.name = name
-            self.package_name = node.get('package_name')
+            self.hint = hint
             # jinja uses these for safety, so we have to override them.
             # see https://github.com/pallets/jinja/blob/master/jinja2/sandbox.py#L332-L339 # noqa
             self.unsafe_callable = False
             self.alters_data = False
 
-        def __deepcopy__(self, memo):
-            path = os.path.join(self.node.get('root_path'),
-                                self.node.get('original_file_path'))
-
-            logger.debug(
-                'dbt encountered an undefined variable, "{}" in node {}.{} '
-                '(source path: {})'
-                .format(self.name, self.node.get('package_name'),
-                        self.node.get('name'), path))
-
-            # match jinja's message
-            dbt.exceptions.raise_compiler_error(
-                "{!r} is undefined".format(self.name),
-                node=self.node
-            )
-
         def __getitem__(self, name):
             # Propagate the undefined value if a caller accesses this as if it
             # were a dictionary
@@ -213,93 +431,214 @@ def create_macro_capture_env(node):
                     .format(type(self).__name__, name)
                 )
 
-            self.package_name = self.name
             self.name = name
 
-            return self
+            return self.__class__(hint=self.hint, name=self.name)
 
         def __call__(self, *args, **kwargs):
             return self
 
-    return ParserMacroCapture
+        def __reduce__(self):
+            raise_compiler_error(f'{self.name} is undefined', node=node)
+
+    return Undefined
 
 
-def get_environment(node=None, capture_macros=False):
-    args = {
+NATIVE_FILTERS: Dict[str, Callable[[Any], Any]] = {
+    'as_text': TextMarker,
+    'as_bool': BoolMarker,
+    'as_native': NativeMarker,
+    'as_number': NumberMarker,
+}
+
+
+TEXT_FILTERS: Dict[str, Callable[[Any], Any]] = {
+    'as_text': lambda x: x,
+    'as_bool': lambda x: x,
+    'as_native': lambda x: x,
+    'as_number': lambda x: x,
+}
+
+
+def get_environment(
+    node=None,
+    capture_macros: bool = False,
+    native: bool = False,
+) -> jinja2.Environment:
+    args: Dict[str, List[Union[str, Type[jinja2.ext.Extension]]]] = {
         'extensions': ['jinja2.ext.do']
     }
 
     if capture_macros:
-        args['undefined'] = create_macro_capture_env(node)
+        args['undefined'] = create_undefined(node)
 
     args['extensions'].append(MaterializationExtension)
     args['extensions'].append(DocumentationExtension)
 
-    return MacroFuzzEnvironment(**args)
+    env_cls: Type[jinja2.Environment]
+    text_filter: Type
+    if native:
+        env_cls = NativeSandboxEnvironment
+        filters = NATIVE_FILTERS
+    else:
+        env_cls = MacroFuzzEnvironment
+        filters = TEXT_FILTERS
+
+    env = env_cls(**args)
+    env.filters.update(filters)
+
+    return env
+
+
+@contextmanager
+def catch_jinja(node=None) -> Iterator[None]:
+    try:
+        yield
+    except jinja2.exceptions.TemplateSyntaxError as e:
+        e.translated = False
+        raise CompilationException(str(e), node) from e
+    except jinja2.exceptions.UndefinedError as e:
+        raise CompilationException(str(e), node) from e
+    except CompilationException as exc:
+        exc.add_node(node)
+        raise
 
 
 def parse(string):
-    try:
-        return get_environment().parse(dbt.compat.to_string(string))
-
-    except (jinja2.exceptions.TemplateSyntaxError,
-            jinja2.exceptions.UndefinedError) as e:
-        e.translated = False
-        dbt.exceptions.raise_compiler_error(str(e))
+    with catch_jinja():
+        return get_environment().parse(str(string))
 
 
-def get_template(string, ctx, node=None, capture_macros=False):
-    try:
-        env = get_environment(node, capture_macros)
+def get_template(
+    string: str,
+    ctx: Dict[str, Any],
+    node=None,
+    capture_macros: bool = False,
+    native: bool = False,
+):
+    with catch_jinja(node):
+        env = get_environment(node, capture_macros, native=native)
 
-        template_source = dbt.compat.to_string(string)
+        template_source = str(string)
         return env.from_string(template_source, globals=ctx)
 
-    except (jinja2.exceptions.TemplateSyntaxError,
-            jinja2.exceptions.UndefinedError) as e:
-        e.translated = False
-        dbt.exceptions.raise_compiler_error(str(e), node)
 
-
-def render_template(template, ctx, node=None):
-    try:
+def render_template(template, ctx: Dict[str, Any], node=None) -> str:
+    with catch_jinja(node):
         return template.render(ctx)
 
-    except (jinja2.exceptions.TemplateSyntaxError,
-            jinja2.exceptions.UndefinedError) as e:
-        e.translated = False
-        dbt.exceptions.raise_compiler_error(str(e), node)
+
+def _requote_result(raw_value: str, rendered: str) -> str:
+    double_quoted = raw_value.startswith('"') and raw_value.endswith('"')
+    single_quoted = raw_value.startswith("'") and raw_value.endswith("'")
+    if double_quoted:
+        quote_char = '"'
+    elif single_quoted:
+        quote_char = "'"
+    else:
+        quote_char = ''
+    return f'{quote_char}{rendered}{quote_char}'
 
 
-def get_rendered(string, ctx, node=None,
-                 capture_macros=False):
-    template = get_template(string, ctx, node,
-                            capture_macros=capture_macros)
+# performance note: Local benmcharking (so take it with a big grain of salt!)
+# on this indicates that it is is on average slightly slower than
+# checking two separate patterns, but the standard deviation is smaller with
+# one pattern. The time difference between the two was ~2 std deviations, which
+# is small enough that I've just chosen the more readable option.
+_HAS_RENDER_CHARS_PAT = re.compile(r'({[{%#]|[#}%]})')
 
+
+def get_rendered(
+    string: str,
+    ctx: Dict[str, Any],
+    node=None,
+    capture_macros: bool = False,
+    native: bool = False,
+) -> str:
+    # performance optimization: if there are no jinja control characters in the
+    # string, we can just return the input. Fall back to jinja if the type is
+    # not a string or if native rendering is enabled (so '1' -> 1, etc...)
+    # If this is desirable in the native env as well, we could handle the
+    # native=True case by passing the input string to ast.literal_eval, like
+    # the native renderer does.
+    if (
+        not native and
+        isinstance(string, str) and
+        _HAS_RENDER_CHARS_PAT.search(string) is None
+    ):
+        return string
+    template = get_template(
+        string,
+        ctx,
+        node,
+        capture_macros=capture_macros,
+        native=native,
+    )
     return render_template(template, ctx, node)
 
 
-def undefined_error(msg):
+def undefined_error(msg) -> NoReturn:
     raise jinja2.exceptions.UndefinedError(msg)
 
 
-def extract_toplevel_blocks(data, allowed_blocks=None, collect_raw_data=True):
+def extract_toplevel_blocks(
+    data: str,
+    allowed_blocks: Optional[Set[str]] = None,
+    collect_raw_data: bool = True,
+) -> List[Union[BlockData, BlockTag]]:
     """Extract the top level blocks with matching block types from a jinja
     file, with some special handling for block nesting.
 
-    :param str data: The data to extract blocks from.
-    :param Optional[Set[str]] allowed_blocks: The names of the blocks to
-        extract from the file. They may not be nested within if/for blocks.
-        If None, use the default values.
-    :param bool collect_raw_data: If set, raw data between matched blocks will
-        also be part of the results, as `BlockData` objects. They have a
+    :param data: The data to extract blocks from.
+    :param allowed_blocks: The names of the blocks to extract from the file.
+        They may not be nested within if/for blocks. If None, use the default
+        values.
+    :param collect_raw_data: If set, raw data between matched blocks will also
+        be part of the results, as `BlockData` objects. They have a
         `block_type_name` field of `'__dbt_data'` and will never have a
         `block_name`.
-    :return List[Union[BlockData, BlockTag]]: A list of `BlockTag`s matching
-        the allowed block types and (if `collect_raw_data` is `True`)
-        `BlockData` objects.
+    :return: A list of `BlockTag`s matching the allowed block types and (if
+        `collect_raw_data` is `True`) `BlockData` objects.
     """
     return BlockIterator(data).lex_for_blocks(
         allowed_blocks=allowed_blocks,
         collect_raw_data=collect_raw_data
     )
+
+
+SCHEMA_TEST_KWARGS_NAME = '_dbt_schema_test_kwargs'
+
+
+def add_rendered_test_kwargs(
+    context: Dict[str, Any],
+    node: Union[ParsedSchemaTestNode, CompiledSchemaTestNode],
+    capture_macros: bool = False,
+) -> None:
+    """Render each of the test kwargs in the given context using the native
+    renderer, then insert that value into the given context as the special test
+    keyword arguments member.
+    """
+    looks_like_func = r'^\s*(env_var|ref|var|source|doc)\s*\(.+\)\s*$'
+
+    def _convert_function(
+        value: Any, keypath: Tuple[Union[str, int], ...]
+    ) -> Any:
+        if isinstance(value, str):
+            if keypath == ('column_name',):
+                # special case: Don't render column names as native, make them
+                # be strings
+                return value
+
+            if re.match(looks_like_func, value) is not None:
+                # curly braces to make rendering happy
+                value = f'{{{{ {value} }}}}'
+
+            value = get_rendered(
+                value, context, node, capture_macros=capture_macros,
+                native=True
+            )
+
+        return value
+
+    kwargs = deep_map(_convert_function, node.test_metadata.kwargs)
+    context[SCHEMA_TEST_KWARGS_NAME] = kwargs

core/dbt/clients/registry.py

@@ -1,5 +1,4 @@
 from functools import wraps
-import six
 import requests
 from dbt.exceptions import RegistryException
 from dbt.utils import memoized
@@ -33,10 +32,10 @@ def _wrap_exceptions(fn):
                 if attempt < max_attempts:
                     time.sleep(1)
                     continue
-                six.raise_from(
-                    RegistryException('Unable to connect to registry hub'),
-                    exc
-                )
+
+                raise RegistryException(
+                    'Unable to connect to registry hub'
+                ) from exc
     return wrapper
 
 

core/dbt/clients/system.py

@@ -3,39 +3,52 @@ import fnmatch
 import json
 import os
 import os.path
+import re
 import shutil
 import subprocess
 import sys
 import tarfile
 import requests
 import stat
+from typing import (
+    Type, NoReturn, List, Optional, Dict, Any, Tuple, Callable, Union
+)
 
-import dbt.compat
 import dbt.exceptions
 import dbt.utils
 
 from dbt.logger import GLOBAL_LOGGER as logger
 
+if sys.platform == 'win32':
+    from ctypes import WinDLL, c_bool
+else:
+    WinDLL = None
+    c_bool = None
 
-def find_matching(root_path,
-                  relative_paths_to_search,
-                  file_pattern):
+
+def find_matching(
+    root_path: str,
+    relative_paths_to_search: List[str],
+    file_pattern: str,
+) -> List[Dict[str, str]]:
     """
     Given an absolute `root_path`, a list of relative paths to that
     absolute root path (`relative_paths_to_search`), and a `file_pattern`
     like '*.sql', returns information about the files. For example:
 
-    > find_matching('/root/path', 'models', '*.sql')
+    > find_matching('/root/path', ['models'], '*.sql')
 
       [ { 'absolute_path': '/root/path/models/model_one.sql',
-          'relative_path': 'models/model_one.sql',
+          'relative_path': 'model_one.sql',
           'searched_path': 'models' },
         { 'absolute_path': '/root/path/models/subdirectory/model_two.sql',
-          'relative_path': 'models/subdirectory/model_two.sql',
+          'relative_path': 'subdirectory/model_two.sql',
           'searched_path': 'models' } ]
     """
     matching = []
     root_path = os.path.normpath(root_path)
+    regex = fnmatch.translate(file_pattern)
+    reobj = re.compile(regex, re.IGNORECASE)
 
     for relative_path_to_search in relative_paths_to_search:
         absolute_path_to_search = os.path.join(
@@ -46,9 +59,9 @@ def find_matching(root_path,
             for local_file in local_files:
                 absolute_path = os.path.join(current_path, local_file)
                 relative_path = os.path.relpath(
-                    absolute_path, absolute_path_to_search)
-
-                if fnmatch.fnmatch(local_file, file_pattern):
+                    absolute_path, absolute_path_to_search
+                )
+                if reobj.match(local_file):
                     matching.append({
                         'searched_path': relative_path_to_search,
                         'absolute_path': absolute_path,
@@ -58,7 +71,8 @@ def find_matching(root_path,
     return matching
 
 
-def load_file_contents(path, strip=True):
+def load_file_contents(path: str, strip: bool = True) -> str:
+    path = convert_path(path)
     with open(path, 'rb') as handle:
         to_return = handle.read().decode('utf-8')
 
@@ -68,12 +82,13 @@ def load_file_contents(path, strip=True):
     return to_return
 
 
-def make_directory(path):
+def make_directory(path: str) -> None:
     """
     Make a directory and any intermediate directories that don't already
     exist. This function handles the case where two threads try to create
     a directory at once.
     """
+    path = convert_path(path)
     if not os.path.exists(path):
         # concurrent writes that try to create the same dir can fail
         try:
@@ -86,12 +101,13 @@ def make_directory(path):
                 raise e
 
 
-def make_file(path, contents='', overwrite=False):
+def make_file(path: str, contents: str = '', overwrite: bool = False) -> bool:
     """
     Make a file at `path` assuming that the directory it resides in already
     exists. The file is saved with contents `contents`
     """
     if overwrite or not os.path.exists(path):
+        path = convert_path(path)
         with open(path, 'w') as fh:
             fh.write(contents)
         return True
@@ -99,32 +115,64 @@ def make_file(path, contents='', overwrite=False):
     return False
 
 
-def make_symlink(source, link_path):
+def make_symlink(source: str, link_path: str) -> None:
     """
     Create a symlink at `link_path` referring to `source`.
     """
     if not supports_symlinks():
         dbt.exceptions.system_error('create a symbolic link')
 
-    return os.symlink(source, link_path)
+    os.symlink(source, link_path)
 
 
-def supports_symlinks():
+def supports_symlinks() -> bool:
     return getattr(os, "symlink", None) is not None
 
 
-def write_file(path, contents=''):
-    make_directory(os.path.dirname(path))
-    dbt.compat.write_file(path, contents)
-
+def write_file(path: str, contents: str = '') -> bool:
+    path = convert_path(path)
+    try:
+        make_directory(os.path.dirname(path))
+        with open(path, 'w', encoding='utf-8') as f:
+            f.write(str(contents))
+    except Exception as exc:
+        # note that you can't just catch FileNotFound, because sometimes
+        # windows apparently raises something else.
+        # It's also not sufficient to look at the path length, because
+        # sometimes windows fails to write paths that are less than the length
+        # limit. So on windows, suppress all errors that happen from writing
+        # to disk.
+        if os.name == 'nt':
+            # sometimes we get a winerror of 3 which means the path was
+            # definitely too long, but other times we don't and it means the
+            # path was just probably too long. This is probably based on the
+            # windows/python version.
+            if getattr(exc, 'winerror', 0) == 3:
+                reason = 'Path was too long'
+            else:
+                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}'
+            )
+        else:
+            raise
     return True
 
 
-def write_json(path, data):
+def read_json(path: str) -> Dict[str, Any]:
+    return json.loads(load_file_contents(path))
+
+
+def write_json(path: str, data: Dict[str, Any]) -> bool:
     return write_file(path, json.dumps(data, cls=dbt.utils.JSONEncoder))
 
 
-def _windows_rmdir_readonly(func, path, exc):
+def _windows_rmdir_readonly(
+    func: Callable[[str], Any], path: str, exc: Tuple[Any, OSError, Any]
+):
     exception_val = exc[1]
     if exception_val.errno == errno.EACCES:
         os.chmod(path, stat.S_IWUSR)
@@ -133,7 +181,7 @@ def _windows_rmdir_readonly(func, path, exc):
         raise
 
 
-def resolve_path_from_base(path_to_resolve, base_path):
+def resolve_path_from_base(path_to_resolve: str, base_path: str) -> str:
     """
     If path-to_resolve is a relative path, create an absolute path
     with base_path as the base.
@@ -147,34 +195,109 @@ def resolve_path_from_base(path_to_resolve, base_path):
             os.path.expanduser(path_to_resolve)))
 
 
-def rmdir(path):
+def rmdir(path: str) -> None:
     """
     Recursively deletes a directory. Includes an error handler to retry with
     different permissions on Windows. Otherwise, removing directories (eg.
     cloned via git) can cause rmtree to throw a PermissionError exception
     """
-    logger.debug("DEBUG** Window rmdir sys.platform: {}".format(sys.platform))
+    path = convert_path(path)
     if sys.platform == 'win32':
         onerror = _windows_rmdir_readonly
     else:
         onerror = None
 
-    return shutil.rmtree(path, onerror=onerror)
+    shutil.rmtree(path, onerror=onerror)
 
 
-def remove_file(path):
-    return os.remove(path)
+def _win_prepare_path(path: str) -> str:
+    """Given a windows path, prepare it for use by making sure it is absolute
+    and normalized.
+    """
+    path = os.path.normpath(path)
+
+    # if a path starts with '\', splitdrive() on it will return '' for the
+    # drive, but the prefix requires a drive letter. So let's add the drive
+    # letter back in.
+    # Unless it starts with '\\'. In that case, the path is a UNC mount point
+    # and splitdrive will be fine.
+    if not path.startswith('\\\\') and path.startswith('\\'):
+        curdrive = os.path.splitdrive(os.getcwd())[0]
+        path = curdrive + path
+
+    # now our path is either an absolute UNC path or relative to the current
+    # directory. If it's relative, we need to make it absolute or the prefix
+    # won't work. `ntpath.abspath` allegedly doesn't always play nice with long
+    # paths, so do this instead.
+    if not os.path.splitdrive(path)[0]:
+        path = os.path.join(os.getcwd(), path)
+
+    return path
 
 
-def path_exists(path):
+def _supports_long_paths() -> bool:
+    if sys.platform != 'win32':
+        return True
+    # Eryk Sun says to use `WinDLL('ntdll')` instead of `windll.ntdll` because
+    # of pointer caching in a comment here:
+    # https://stackoverflow.com/a/35097999/11262881
+    # I don't know exaclty what he means, but I am inclined to believe him as
+    # he's pretty active on Python windows bugs!
+    try:
+        dll = WinDLL('ntdll')
+    except OSError:  # I don't think this happens? you need ntdll to run python
+        return False
+    # not all windows versions have it at all
+    if not hasattr(dll, 'RtlAreLongPathsEnabled'):
+        return False
+    # tell windows we want to get back a single unsigned byte (a bool).
+    dll.RtlAreLongPathsEnabled.restype = c_bool
+    return dll.RtlAreLongPathsEnabled()
+
+
+def convert_path(path: str) -> str:
+    """Convert a path that dbt has, which might be >260 characters long, to one
+    that will be writable/readable on Windows.
+
+    On other platforms, this is a no-op.
+    """
+    # some parts of python seem to append '\*.*' to strings, better safe than
+    # sorry.
+    if len(path) < 250:
+        return path
+    if _supports_long_paths():
+        return path
+
+    prefix = '\\\\?\\'
+    # Nothing to do
+    if path.startswith(prefix):
+        return path
+
+    path = _win_prepare_path(path)
+
+    # add the prefix. The check is just in case os.getcwd() does something
+    # unexpected - I believe this if-state should always be True though!
+    if not path.startswith(prefix):
+        path = prefix + path
+    return path
+
+
+def remove_file(path: str) -> None:
+    path = convert_path(path)
+    os.remove(path)
+
+
+def path_exists(path: str) -> bool:
+    path = convert_path(path)
     return os.path.lexists(path)
 
 
-def path_is_symlink(path):
+def path_is_symlink(path: str) -> bool:
+    path = convert_path(path)
     return os.path.islink(path)
 
 
-def open_dir_cmd():
+def open_dir_cmd() -> str:
     # https://docs.python.org/2/library/sys.html#sys.platform
     if sys.platform == 'win32':
         return 'start'
@@ -186,7 +309,9 @@ def open_dir_cmd():
         return 'xdg-open'
 
 
-def _handle_posix_cwd_error(exc, cwd, cmd):
+def _handle_posix_cwd_error(
+    exc: OSError, cwd: str, cmd: List[str]
+) -> NoReturn:
     if exc.errno == errno.ENOENT:
         message = 'Directory does not exist'
     elif exc.errno == errno.EACCES:
@@ -198,7 +323,9 @@ def _handle_posix_cwd_error(exc, cwd, cmd):
     raise dbt.exceptions.WorkingDirectoryError(cwd, cmd, message)
 
 
-def _handle_posix_cmd_error(exc, cwd, cmd):
+def _handle_posix_cmd_error(
+    exc: OSError, cwd: str, cmd: List[str]
+) -> NoReturn:
     if exc.errno == errno.ENOENT:
         message = "Could not find command, ensure it is in the user's PATH"
     elif exc.errno == errno.EACCES:
@@ -208,7 +335,7 @@ def _handle_posix_cmd_error(exc, cwd, cmd):
     raise dbt.exceptions.ExecutableError(cwd, cmd, message)
 
 
-def _handle_posix_error(exc, cwd, cmd):
+def _handle_posix_error(exc: OSError, cwd: str, cmd: List[str]) -> NoReturn:
     """OSError handling for posix systems.
 
     Some things that could happen to trigger an OSError:
@@ -235,8 +362,8 @@ def _handle_posix_error(exc, cwd, cmd):
         _handle_posix_cmd_error(exc, cwd, cmd)
 
 
-def _handle_windows_error(exc, cwd, cmd):
-    cls = dbt.exceptions.CommandError
+def _handle_windows_error(exc: OSError, cwd: str, cmd: List[str]) -> NoReturn:
+    cls: Type[dbt.exceptions.Exception] = dbt.exceptions.CommandError
     if exc.errno == errno.ENOENT:
         message = ("Could not find command, ensure it is in the user's PATH "
                    "and that the user has permissions to run it")
@@ -255,7 +382,7 @@ def _handle_windows_error(exc, cwd, cmd):
     raise cls(cwd, cmd, message)
 
 
-def _interpret_oserror(exc, cwd, cmd):
+def _interpret_oserror(exc: OSError, cwd: str, cmd: List[str]) -> NoReturn:
     """Interpret an OSError exc and raise the appropriate dbt exception.
 
     """
@@ -274,7 +401,9 @@ def _interpret_oserror(exc, cwd, cmd):
     )
 
 
-def run_cmd(cwd, cmd, env=None):
+def run_cmd(
+    cwd: str, cmd: List[str], env: Optional[Dict[str, Any]] = None
+) -> Tuple[bytes, bytes]:
     logger.debug('Executing "{}"'.format(' '.join(cmd)))
     if len(cmd) == 0:
         raise dbt.exceptions.CommandError(cwd, cmd)
@@ -298,8 +427,8 @@ def run_cmd(cwd, cmd, env=None):
     except OSError as exc:
         _interpret_oserror(exc, cwd, cmd)
 
-    logger.debug('STDOUT: "{}"'.format(out))
-    logger.debug('STDERR: "{}"'.format(err))
+    logger.debug('STDOUT: "{!s}"'.format(out))
+    logger.debug('STDERR: "{!s}"'.format(err))
 
     if proc.returncode != 0:
         logger.debug('command return code={}'.format(proc.returncode))
@@ -309,14 +438,18 @@ def run_cmd(cwd, cmd, env=None):
     return out, err
 
 
-def download(url, path):
-    response = requests.get(url)
+def download(url: str, path: str, timeout: Union[float, tuple] = None) -> None:
+    path = convert_path(path)
+    connection_timeout = timeout or float(os.getenv('DBT_HTTP_TIMEOUT', 10))
+    response = requests.get(url, timeout=connection_timeout)
     with open(path, 'wb') as handle:
         for block in response.iter_content(1024 * 64):
             handle.write(block)
 
 
-def rename(from_path, to_path, force=False):
+def rename(from_path: str, to_path: str, force: bool = False) -> None:
+    from_path = convert_path(from_path)
+    to_path = convert_path(to_path)
     is_symlink = path_is_symlink(to_path)
 
     if os.path.exists(to_path) and force:
@@ -328,7 +461,10 @@ def rename(from_path, to_path, force=False):
     shutil.move(from_path, to_path)
 
 
-def untar_package(tar_path, dest_dir, rename_to=None):
+def untar_package(
+    tar_path: str, dest_dir: str, rename_to: Optional[str] = None
+) -> None:
+    tar_path = convert_path(tar_path)
     tar_dir_name = None
     with tarfile.open(tar_path, 'r') as tarball:
         tarball.extractall(dest_dir)
@@ -365,6 +501,8 @@ def move(src, dst):
     This is almost identical to the real shutil.move, except it uses our rmtree
     and skips handling non-windows OSes since the existing one works ok there.
     """
+    src = convert_path(src)
+    dst = convert_path(dst)
     if os.name != 'nt':
         return shutil.move(src, dst)
 
@@ -399,4 +537,5 @@ def rmtree(path):
     """Recursively remove path. On permissions errors on windows, try to remove
     the read-only flag and try again.
     """
+    path = convert_path(path)
     return shutil.rmtree(path, onerror=chmod_and_retry)

core/dbt/clients/yaml_helper.py

@@ -1,9 +1,17 @@
-import dbt.compat
+from typing import Any
+
 import dbt.exceptions
 
 import yaml
 import yaml.scanner
 
+# the C version is faster, but it doesn't always exist
+YamlLoader: Any
+try:
+    from yaml import CSafeLoader as YamlLoader
+except ImportError:
+    from yaml import SafeLoader as YamlLoader
+
 
 YAML_ERROR_MESSAGE = """
 Syntax error near line {line_number}
@@ -17,7 +25,7 @@ Raw Error:
 
 
 def line_no(i, line, width=3):
-    line_number = dbt.compat.to_string(i).ljust(width)
+    line_number = str(i).ljust(width)
     return "{}| {}".format(line_number, line)
 
 
@@ -45,13 +53,17 @@ def contextualized_yaml_error(raw_contents, error):
                                      raw_error=error)
 
 
+def safe_load(contents):
+    return yaml.load(contents, Loader=YamlLoader)
+
+
 def load_yaml_text(contents):
     try:
-        return yaml.safe_load(contents)
+        return safe_load(contents)
     except (yaml.scanner.ScannerError, yaml.YAMLError) as e:
         if hasattr(e, 'problem_mark'):
             error = contextualized_yaml_error(contents, e)
         else:
-            error = dbt.compat.to_string(e)
+            error = str(e)
 
         raise dbt.exceptions.ValidationException(error)

core/dbt/compat.py

@@ -1,138 +0,0 @@
-# flake8: noqa
-
-import abc
-import codecs
-import warnings
-import decimal
-
-try:
-    import cdecimal
-except ImportError:
-    DECIMALS = (decimal.Decimal,)
-else:
-    DECIMALS = (decimal.Decimal, cdecimal.Decimal)
-
-WHICH_PYTHON = None
-
-try:
-    basestring
-    WHICH_PYTHON = 2
-except NameError:
-    WHICH_PYTHON = 3
-
-if WHICH_PYTHON == 2:
-    basestring = basestring
-    bigint = long
-    NUMBERS = DECIMALS + (int, float, long)
-    import __builtin__ as builtins
-else:
-    basestring = str
-    bigint = int
-    NUMBERS = DECIMALS + (int, float)
-    import builtins
-
-if WHICH_PYTHON == 2:
-    from SimpleHTTPServer import SimpleHTTPRequestHandler
-    from SocketServer import TCPServer
-    from Queue import PriorityQueue, Empty as QueueEmpty
-    from thread import get_ident
-else:
-    from http.server import SimpleHTTPRequestHandler
-    from socketserver import TCPServer
-    from queue import PriorityQueue, Empty as QueueEmpty
-    from threading import get_ident
-
-
-def to_unicode(s):
-    if WHICH_PYTHON == 2:
-        return unicode(s)
-    else:
-        return str(s)
-
-
-def to_string(s):
-    if WHICH_PYTHON == 2:
-        if isinstance(s, unicode):
-            return s
-        elif isinstance(s, basestring):
-            return to_unicode(s)
-        else:
-            return to_unicode(str(s))
-    else:
-        if isinstance(s, basestring):
-            return s
-        else:
-            return str(s)
-
-
-def to_native_string(s):
-    if WHICH_PYTHON == 2:
-        if isinstance(s, unicode):
-            return str(s)
-        elif isinstance(s, basestring):
-            return s
-        else:
-            return str(s)
-    else:
-        if isinstance(s, basestring):
-            return s
-        else:
-            return str(s)
-
-
-def write_file(path, s):
-    if WHICH_PYTHON == 2:
-        open = codecs.open
-    else:
-        open = builtins.open
-    with open(path, 'w', encoding='utf-8') as f:
-        return f.write(to_string(s))
-
-
-def open_file(path):
-    """Open the path for reading. It must be utf-8 encoded."""
-    if WHICH_PYTHON == 2:
-        open = codecs.open
-    else:
-        open = builtins.open
-    return open(path, encoding='utf-8')
-
-
-if WHICH_PYTHON == 2:
-    # In python 2, classmethod and staticmethod do not allow setters, so you
-    # can't treat classmethods as first-class objects like you can regular
-    # functions. This rarely matters, but for metaclass shenanigans on the
-    # adapter we do want to set attributes on classmethods.
-    class _classmethod(classmethod):
-        pass
-
-    classmethod = _classmethod
-
-    # python 2.7 is missing this
-    class abstractclassmethod(classmethod):
-        __isabstractmethod__ = True
-
-        def __init__(self, func):
-            func.__isabstractmethod__ = True
-            super(abstractclassmethod, self).__init__(func)
-
-    class abstractstaticmethod(staticmethod):
-        __isabstractmethod__ = True
-
-        def __init__(self, func):
-            func.__isabstractmethod__ = True
-            super(abstractstaticmethod, self).__init__(func)
-
-else:
-    abstractclassmethod = abc.abstractclassmethod
-    abstractstaticmethod = abc.abstractstaticmethod
-    classmethod = classmethod
-
-
-def suppress_warnings():
-    # in python 2, ResourceWarnings don't exist.
-    # in python 3, suppress ResourceWarnings about unclosed sockets, as the
-    # bigquery library never closes them.
-    if WHICH_PYTHON == 3:
-        warnings.filterwarnings("ignore", category=ResourceWarning,
-                                message="unclosed.*<socket.socket.*>")

core/dbt/compilation.py

@@ -1,53 +1,98 @@
-import itertools
 import os
 from collections import defaultdict
+from typing import List, Dict, Any, Tuple, cast, Optional
 
-import dbt.utils
-import dbt.include
-import dbt.tracking
-
-from dbt.utils import get_materialization, NodeType, is_type
-from dbt.linker import Linker
-
-import dbt.compat
-import dbt.context.runtime
-import dbt.contracts.project
-import dbt.exceptions
-import dbt.flags
-import dbt.loader
-import dbt.config
-from dbt.contracts.graph.compiled import CompiledNode
+import networkx as nx  # type: ignore
+import sqlparse
 
+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.contracts.graph.manifest import Manifest
+from dbt.contracts.graph.compiled import (
+    CompiledDataTestNode,
+    CompiledSchemaTestNode,
+    COMPILED_TYPES,
+    GraphMemberNode,
+    InjectedCTE,
+    ManifestNode,
+    NonSourceCompiledNode,
+)
+from dbt.contracts.graph.parsed import ParsedNode
+from dbt.exceptions import (
+    dependency_not_found,
+    InternalException,
+    RuntimeException,
+)
+from dbt.graph import Graph
 from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.node_types import NodeType
+from dbt.utils import pluralize
 
 graph_file_name = 'graph.gpickle'
 
 
+def _compiled_type_for(model: ParsedNode):
+    if type(model) not in COMPILED_TYPES:
+        raise InternalException(
+            f'Asked to compile {type(model)} node, but it has no compiled form'
+        )
+    return COMPILED_TYPES[type(model)]
+
+
 def print_compile_stats(stats):
     names = {
-        NodeType.Model: 'models',
-        NodeType.Test: 'tests',
-        NodeType.Snapshot: 'snapshots',
-        NodeType.Analysis: 'analyses',
-        NodeType.Macro: 'macros',
-        NodeType.Operation: 'operations',
-        NodeType.Seed: 'seed files',
-        NodeType.Source: 'sources',
+        NodeType.Model: 'model',
+        NodeType.Test: 'test',
+        NodeType.Snapshot: 'snapshot',
+        NodeType.Analysis: 'analysis',
+        NodeType.Macro: 'macro',
+        NodeType.Operation: 'operation',
+        NodeType.Seed: 'seed file',
+        NodeType.Source: 'source',
+        NodeType.Exposure: 'exposure',
     }
 
     results = {k: 0 for k in names.keys()}
     results.update(stats)
 
-    stat_line = ", ".join(
-        ["{} {}".format(ct, names.get(t)) for t, ct in results.items()])
+    stat_line = ", ".join([
+        pluralize(ct, names.get(t)) for t, ct in results.items()
+        if t in names
+    ])
 
-    logger.notice("Found {}".format(stat_line))
+    logger.info("Found {}".format(stat_line))
+
+
+def _node_enabled(node: ManifestNode):
+    # Disabled models are already excluded from the manifest
+    if node.resource_type == NodeType.Test and not node.config.enabled:
+        return False
+    else:
+        return True
+
+
+def _generate_stats(manifest: Manifest):
+    stats: Dict[NodeType, int] = defaultdict(int)
+    for node in manifest.nodes.values():
+        if _node_enabled(node):
+            stats[node.resource_type] += 1
+
+    for source in manifest.sources.values():
+        stats[source.resource_type] += 1
+    for exposure in manifest.exposures.values():
+        stats[exposure.resource_type] += 1
+    for macro in manifest.macros.values():
+        stats[macro.resource_type] += 1
+    return stats
 
 
 def _add_prepended_cte(prepended_ctes, new_cte):
-    for dct in prepended_ctes:
-        if dct['id'] == new_cte['id']:
-            dct['sql'] = new_cte['sql']
+    for cte in prepended_ctes:
+        if cte.id == new_cte.id:
+            cte.sql = new_cte.sql
             return
     prepended_ctes.append(new_cte)
 
@@ -57,52 +102,291 @@ def _extend_prepended_ctes(prepended_ctes, new_prepended_ctes):
         _add_prepended_cte(prepended_ctes, new_cte)
 
 
-def prepend_ctes(model, manifest):
-    model, _, manifest = recursively_prepend_ctes(model, manifest)
+class Linker:
+    def __init__(self, data=None):
+        if data is None:
+            data = {}
+        self.graph = nx.DiGraph(**data)
 
-    return (model, manifest)
+    def edges(self):
+        return self.graph.edges()
+
+    def nodes(self):
+        return self.graph.nodes()
+
+    def find_cycles(self):
+        try:
+            cycle = nx.find_cycle(self.graph)
+        except nx.NetworkXNoCycle:
+            return None
+        else:
+            # cycles is a List[Tuple[str, ...]]
+            return " --> ".join(c[0] for c in cycle)
+
+    def dependency(self, node1, node2):
+        "indicate that node1 depends on node2"
+        self.graph.add_node(node1)
+        self.graph.add_node(node2)
+        self.graph.add_edge(node2, node1)
+
+    def add_node(self, node):
+        self.graph.add_node(node)
+
+    def write_graph(self, outfile: str, manifest: Manifest):
+        """Write the graph to a gpickle file. Before doing so, serialize and
+        include all nodes in their corresponding graph entries.
+        """
+        out_graph = self.graph.copy()
+        for node_id in self.graph.nodes():
+            data = manifest.expect(node_id).to_dict()
+            out_graph.add_node(node_id, **data)
+        nx.write_gpickle(out_graph, outfile)
 
 
-def recursively_prepend_ctes(model, manifest):
-    if model.extra_ctes_injected:
-        return (model, model.extra_ctes, manifest)
-
-    if dbt.flags.STRICT_MODE:
-        # ensure that the cte we're adding to is compiled
-        CompiledNode(**model.serialize())
-
-    prepended_ctes = []
-
-    for cte in model.extra_ctes:
-        cte_id = cte['id']
-        cte_to_add = manifest.nodes.get(cte_id)
-        cte_to_add, new_prepended_ctes, manifest = recursively_prepend_ctes(
-            cte_to_add, manifest)
-        _extend_prepended_ctes(prepended_ctes, new_prepended_ctes)
-        new_cte_name = '__dbt__CTE__{}'.format(cte_to_add.get('name'))
-        sql = ' {} as (\n{}\n)'.format(new_cte_name, cte_to_add.compiled_sql)
-        _add_prepended_cte(prepended_ctes, {'id': cte_id, 'sql': sql})
-
-    model.prepend_ctes(prepended_ctes)
-
-    manifest.nodes[model.unique_id] = model
-
-    return (model, prepended_ctes, manifest)
-
-
-class Compiler(object):
+class Compiler:
     def __init__(self, config):
         self.config = config
 
     def initialize(self):
-        dbt.clients.system.make_directory(self.config.target_path)
-        dbt.clients.system.make_directory(self.config.modules_path)
+        make_directory(self.config.target_path)
+        make_directory(self.config.modules_path)
 
-    def compile_node(self, node, manifest, extra_context=None):
+    # creates a ModelContext which is converted to
+    # a dict for jinja rendering of SQL
+    def _create_node_context(
+        self,
+        node: NonSourceCompiledNode,
+        manifest: Manifest,
+        extra_context: Dict[str, Any],
+    ) -> Dict[str, Any]:
+
+        context = generate_runtime_model(
+            node, self.config, manifest
+        )
+        context.update(extra_context)
+        if isinstance(node, CompiledSchemaTestNode):
+            # for test nodes, add a special keyword args value to the context
+            jinja.add_rendered_test_kwargs(context, node)
+
+        return context
+
+    def add_ephemeral_prefix(self, name: str):
+        adapter = get_adapter(self.config)
+        relation_cls = adapter.Relation
+        return relation_cls.add_ephemeral_prefix(name)
+
+    def _get_relation_name(self, node: ParsedNode):
+        relation_name = None
+        if (node.resource_type in NodeType.refable() and
+                not node.is_ephemeral_model):
+            adapter = get_adapter(self.config)
+            relation_cls = adapter.Relation
+            relation_name = str(relation_cls.create_from(self.config, node))
+        return relation_name
+
+    def _inject_ctes_into_sql(self, sql: str, ctes: List[InjectedCTE]) -> str:
+        """
+        `ctes` is a list of InjectedCTEs like:
+
+            [
+                InjectedCTE(
+                    id="cte_id_1",
+                    sql="__dbt__cte__ephemeral as (select * from table)",
+                ),
+                InjectedCTE(
+                    id="cte_id_2",
+                    sql="__dbt__cte__events as (select id, type from events)",
+                ),
+            ]
+
+        Given `sql` like:
+
+          "with internal_cte as (select * from sessions)
+           select * from internal_cte"
+
+        This will spit out:
+
+          "with __dbt__cte__ephemeral as (select * from table),
+                __dbt__cte__events as (select id, type from events),
+                with internal_cte as (select * from sessions)
+           select * from internal_cte"
+
+        (Whitespace enhanced for readability.)
+        """
+        if len(ctes) == 0:
+            return sql
+
+        parsed_stmts = sqlparse.parse(sql)
+        parsed = parsed_stmts[0]
+
+        with_stmt = None
+        for token in parsed.tokens:
+            if token.is_keyword and token.normalized == 'WITH':
+                with_stmt = token
+                break
+
+        if with_stmt is None:
+            # no with stmt, add one, and inject CTEs right at the beginning
+            first_token = parsed.token_first()
+            with_stmt = sqlparse.sql.Token(sqlparse.tokens.Keyword, 'with')
+            parsed.insert_before(first_token, with_stmt)
+        else:
+            # stmt exists, add a comma (which will come after injected CTEs)
+            trailing_comma = sqlparse.sql.Token(
+                sqlparse.tokens.Punctuation, ','
+            )
+            parsed.insert_after(with_stmt, trailing_comma)
+
+        token = sqlparse.sql.Token(
+            sqlparse.tokens.Keyword,
+            ", ".join(c.sql for c in ctes)
+        )
+        parsed.insert_after(with_stmt, token)
+
+        return str(parsed)
+
+    def _get_dbt_test_name(self) -> str:
+        return 'dbt__cte__internal_test'
+
+    # This method is called by the 'compile_node' method. Starting
+    # from the node that it is passed in, it will recursively call
+    # itself using the 'extra_ctes'.  The 'ephemeral' models do
+    # not produce SQL that is executed directly, instead they
+    # are rolled up into the models that refer to them by
+    # inserting CTEs into the SQL.
+    def _recursively_prepend_ctes(
+        self,
+        model: NonSourceCompiledNode,
+        manifest: Manifest,
+        extra_context: Optional[Dict[str, Any]],
+    ) -> Tuple[NonSourceCompiledNode, List[InjectedCTE]]:
+
+        if model.compiled_sql is None:
+            raise RuntimeException(
+                'Cannot inject ctes into an unparsed node', model
+            )
+        if model.extra_ctes_injected:
+            return (model, model.extra_ctes)
+
+        # Just to make it plain that nothing is actually injected for this case
+        if not model.extra_ctes:
+            model.extra_ctes_injected = True
+            manifest.update_node(model)
+            return (model, model.extra_ctes)
+
+        # This stores the ctes which will all be recursively
+        # gathered and then "injected" into the model.
+        prepended_ctes: List[InjectedCTE] = []
+
+        dbt_test_name = self._get_dbt_test_name()
+
+        # extra_ctes are added to the model by
+        # RuntimeRefResolver.create_relation, which adds an
+        # extra_cte for every model relation which is an
+        # ephemeral model.
+        for cte in model.extra_ctes:
+            if cte.id == dbt_test_name:
+                sql = cte.sql
+            else:
+                if cte.id not in manifest.nodes:
+                    raise InternalException(
+                        f'During compilation, found a cte reference that '
+                        f'could not be resolved: {cte.id}'
+                    )
+                cte_model = manifest.nodes[cte.id]
+
+                if not cte_model.is_ephemeral_model:
+                    raise InternalException(f'{cte.id} is not ephemeral')
+
+                # This model has already been compiled, so it's been
+                # through here before
+                if getattr(cte_model, 'compiled', False):
+                    assert isinstance(cte_model,
+                                      tuple(COMPILED_TYPES.values()))
+                    cte_model = cast(NonSourceCompiledNode, cte_model)
+                    new_prepended_ctes = cte_model.extra_ctes
+
+                # if the cte_model isn't compiled, i.e. first time here
+                else:
+                    # This is an ephemeral parsed model that we can compile.
+                    # Compile and update the node
+                    cte_model = self._compile_node(
+                        cte_model, manifest, extra_context)
+                    # recursively call this method
+                    cte_model, new_prepended_ctes = \
+                        self._recursively_prepend_ctes(
+                            cte_model, manifest, extra_context
+                        )
+                    # Save compiled SQL file and sync manifest
+                    self._write_node(cte_model)
+                    manifest.sync_update_node(cte_model)
+
+                _extend_prepended_ctes(prepended_ctes, new_prepended_ctes)
+
+                new_cte_name = self.add_ephemeral_prefix(cte_model.name)
+                sql = f' {new_cte_name} as (\n{cte_model.compiled_sql}\n)'
+
+            _add_prepended_cte(prepended_ctes, InjectedCTE(id=cte.id, sql=sql))
+
+        # We don't save injected_sql into compiled sql for ephemeral models
+        # because it will cause problems with processing of subsequent models.
+        # Ephemeral models do not produce executable SQL of their own.
+        if not model.is_ephemeral_model:
+            injected_sql = self._inject_ctes_into_sql(
+                model.compiled_sql,
+                prepended_ctes,
+            )
+            model.compiled_sql = injected_sql
+        model.extra_ctes_injected = True
+        model.extra_ctes = prepended_ctes
+        model.validate(model.to_dict())
+
+        manifest.update_node(model)
+
+        return model, prepended_ctes
+
+    def _add_ctes(
+        self,
+        compiled_node: NonSourceCompiledNode,
+        manifest: Manifest,
+        extra_context: Dict[str, Any],
+    ) -> NonSourceCompiledNode:
+        """Wrap the data test SQL in a CTE."""
+
+        # for data tests, we need to insert a special CTE at the end of the
+        # list containing the test query, and then have the "real" query be a
+        # select count(*) from that model.
+        # the benefit of doing it this way is that _add_ctes() can be
+        # rewritten for different adapters to handle databases that don't
+        # support CTEs, or at least don't have full support.
+        if isinstance(compiled_node, CompiledDataTestNode):
+            # the last prepend (so last in order) should be the data test body.
+            # then we can add our select count(*) from _that_ cte as the "real"
+            # compiled_sql, and do the regular prepend logic from CTEs.
+            name = self._get_dbt_test_name()
+            cte = InjectedCTE(
+                id=name,
+                sql=f' {name} as (\n{compiled_node.compiled_sql}\n)'
+            )
+            compiled_node.extra_ctes.append(cte)
+            compiled_node.compiled_sql = f'\nselect count(*) from {name}'
+
+        return compiled_node
+
+    # creates a compiled_node from the ManifestNode passed in,
+    # creates a "context" dictionary for jinja rendering,
+    # and then renders the "compiled_sql" using the node, the
+    # raw_sql and the context.
+    def _compile_node(
+        self,
+        node: ManifestNode,
+        manifest: Manifest,
+        extra_context: Optional[Dict[str, Any]] = None,
+    ) -> NonSourceCompiledNode:
         if extra_context is None:
             extra_context = {}
 
-        logger.debug("Compiling {}".format(node.get('unique_id')))
+        logger.debug("Compiling {}".format(node.unique_id))
 
         data = node.to_dict()
         data.update({
@@ -110,142 +394,116 @@ class Compiler(object):
             'compiled_sql': None,
             'extra_ctes_injected': False,
             'extra_ctes': [],
-            'injected_sql': None,
         })
-        compiled_node = CompiledNode(**data)
+        compiled_node = _compiled_type_for(node).from_dict(data)
 
-        context = dbt.context.runtime.generate(
-            compiled_node, self.config, manifest)
-        context.update(extra_context)
+        context = self._create_node_context(
+            compiled_node, manifest, extra_context
+        )
 
-        compiled_node.compiled_sql = dbt.clients.jinja.get_rendered(
-            node.get('raw_sql'),
+        compiled_node.compiled_sql = jinja.get_rendered(
+            node.raw_sql,
             context,
-            node)
+            node,
+        )
+
+        compiled_node.relation_name = self._get_relation_name(node)
 
         compiled_node.compiled = True
 
-        injected_node, _ = prepend_ctes(compiled_node, manifest)
+        # add ctes for specific test nodes, and also for
+        # possible future use in adapters
+        compiled_node = self._add_ctes(
+            compiled_node, manifest, extra_context
+        )
 
-        should_wrap = {NodeType.Test, NodeType.Operation}
-        if injected_node.resource_type in should_wrap:
-            # data tests get wrapped in count(*)
-            # TODO : move this somewhere more reasonable
-            if 'data' in injected_node.tags and \
-               is_type(injected_node, NodeType.Test):
-                injected_node.wrapped_sql = (
-                    "select count(*) from (\n{test_sql}\n) sbq").format(
-                        test_sql=injected_node.injected_sql)
-            else:
-                # don't wrap schema tests or analyses.
-                injected_node.wrapped_sql = injected_node.injected_sql
+        return compiled_node
 
-        elif is_type(injected_node, NodeType.Snapshot):
-            # unfortunately we do everything automagically for
-            # snapshots. in the future it'd be nice to generate
-            # the SQL at the parser level.
-            pass
-
-        elif(is_type(injected_node, NodeType.Model) and
-             get_materialization(injected_node) == 'ephemeral'):
-            pass
-
-        else:
-            injected_node.wrapped_sql = None
-
-        return injected_node
-
-    def write_graph_file(self, linker, manifest):
+    def write_graph_file(self, linker: Linker, manifest: Manifest):
         filename = graph_file_name
         graph_path = os.path.join(self.config.target_path, filename)
-        linker.write_graph(graph_path, manifest)
+        if flags.WRITE_JSON:
+            linker.write_graph(graph_path, manifest)
 
-    def link_node(self, linker, node, manifest):
+    def link_node(
+        self, linker: Linker, node: GraphMemberNode, manifest: Manifest
+    ):
         linker.add_node(node.unique_id)
 
         for dependency in node.depends_on_nodes:
-            if manifest.nodes.get(dependency):
+            if dependency in manifest.nodes:
                 linker.dependency(
                     node.unique_id,
-                    (manifest.nodes.get(dependency).unique_id))
+                    (manifest.nodes[dependency].unique_id)
+                )
+            elif dependency in manifest.sources:
+                linker.dependency(
+                    node.unique_id,
+                    (manifest.sources[dependency].unique_id)
+                )
             else:
-                dbt.exceptions.dependency_not_found(node, dependency)
+                dependency_not_found(node, dependency)
 
-    def link_graph(self, linker, manifest):
+    def link_graph(self, linker: Linker, manifest: Manifest):
+        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)
+            # linker.add_node(exposure.unique_id)
 
         cycle = linker.find_cycles()
 
         if cycle:
             raise RuntimeError("Found a cycle: {}".format(cycle))
 
-    def compile(self, manifest, write=True):
+    def compile(self, manifest: Manifest, write=True) -> Graph:
+        self.initialize()
         linker = Linker()
 
         self.link_graph(linker, manifest)
 
-        stats = defaultdict(int)
-
-        for node_name, node in itertools.chain(
-                manifest.nodes.items(),
-                manifest.macros.items()):
-            stats[node.resource_type] += 1
+        stats = _generate_stats(manifest)
 
         if write:
             self.write_graph_file(linker, manifest)
         print_compile_stats(stats)
 
-        return linker
+        return Graph(linker.graph)
 
+    # writes the "compiled_sql" into the target/compiled directory
+    def _write_node(self, node: NonSourceCompiledNode) -> ManifestNode:
+        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}"')
 
-def compile_manifest(config, manifest, write=True):
-    compiler = Compiler(config)
-    compiler.initialize()
-    return compiler.compile(manifest, write=write)
+        if node.compiled_sql:
+            node.build_path = node.write_node(
+                self.config.target_path,
+                'compiled',
+                node.compiled_sql
+            )
+        return node
 
+    # This is the main entry point into this code. It's called by
+    # CompileRunner.compile, GenericRPCRunner.compile, and
+    # RunTask.get_hook_sql. It calls '_compile_node' to convert
+    # the node into a compiled node, and then calls the
+    # recursive method to "prepend" the ctes.
+    def compile_node(
+        self,
+        node: ManifestNode,
+        manifest: Manifest,
+        extra_context: Optional[Dict[str, Any]] = None,
+        write: bool = True,
+    ) -> NonSourceCompiledNode:
+        node = self._compile_node(node, manifest, extra_context)
 
-def _is_writable(node):
-    if not node.injected_sql:
-        return False
-
-    if dbt.utils.is_type(node, NodeType.Snapshot):
-        return False
-
-    return True
-
-
-def compile_node(adapter, config, node, manifest, extra_context, write=True):
-    compiler = Compiler(config)
-    node = compiler.compile_node(node, manifest, extra_context)
-    node = _inject_runtime_config(adapter, node, extra_context)
-
-    if write and _is_writable(node):
-        logger.debug('Writing injected SQL for node "{}"'.format(
-            node.unique_id))
-
-        written_path = dbt.writer.write_node(
-            node,
-            config.target_path,
-            'compiled',
-            node.injected_sql)
-
-        node.build_path = written_path
-
-    return node
-
-
-def _inject_runtime_config(adapter, node, extra_context):
-    wrapped_sql = node.wrapped_sql
-    context = _node_context(adapter, node)
-    context.update(extra_context)
-    sql = dbt.clients.jinja.get_rendered(wrapped_sql, context)
-    node.wrapped_sql = sql
-    return node
-
-
-def _node_context(adapter, node):
-    return {
-        "run_started_at": dbt.tracking.active_user.run_started_at,
-        "invocation_id": dbt.tracking.active_user.invocation_id,
-    }
+        node, _ = self._recursively_prepend_ctes(
+            node, manifest, extra_context
+        )
+        if write:
+            self._write_node(node)
+        return node

core/dbt/config/__init__.py

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

core/dbt/config/profile.py

@@ -1,27 +1,28 @@
+from dataclasses import dataclass
+from typing import Any, Dict, Optional, Tuple
 import os
-import pprint
 
-from dbt.adapters.factory import load_plugin
+from hologram import ValidationError
+
 from dbt.clients.system import load_file_contents
 from dbt.clients.yaml_helper import load_yaml_text
-from dbt.contracts.project import ProfileConfig
+from dbt.contracts.connection import Credentials, HasCredentials
+from dbt.contracts.project import ProfileConfig, UserConfig
+from dbt.exceptions import CompilationException
 from dbt.exceptions import DbtProfileError
 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.utils import parse_cli_vars
-from dbt import tracking
-from dbt.ui import printer
+from dbt.utils import coerce_dict_str
 
-from .renderer import ConfigRenderer
+from .renderer import ProfileRenderer
 
 DEFAULT_THREADS = 1
-DEFAULT_SEND_ANONYMOUS_USAGE_STATS = True
-DEFAULT_USE_COLORS = True
 DEFAULT_PROFILES_DIR = os.path.join(os.path.expanduser('~'), '.dbt')
 PROFILES_DIR = os.path.expanduser(
-    os.environ.get('DBT_PROFILES_DIR', DEFAULT_PROFILES_DIR)
+    os.getenv('DBT_PROFILES_DIR', DEFAULT_PROFILES_DIR)
 )
 
 INVALID_PROFILE_MESSAGE = """
@@ -45,83 +46,54 @@ defined in your profiles.yml file. You can find profiles.yml here:
 """.format(profiles_file=PROFILES_DIR)
 
 
-def read_profile(profiles_dir):
+def read_profile(profiles_dir: str) -> Dict[str, Any]:
     path = os.path.join(profiles_dir, 'profiles.yml')
 
     contents = None
     if os.path.isfile(path):
         try:
             contents = load_file_contents(path, strip=False)
-            return load_yaml_text(contents)
+            yaml_content = load_yaml_text(contents)
+            if not yaml_content:
+                msg = f'The profiles.yml file at {path} is empty'
+                raise DbtProfileError(
+                    INVALID_PROFILE_MESSAGE.format(
+                        error_string=msg
+                    )
+                )
+            return yaml_content
         except ValidationException as e:
             msg = INVALID_PROFILE_MESSAGE.format(error_string=e)
-            raise ValidationException(msg)
+            raise ValidationException(msg) from e
 
     return {}
 
 
-class UserConfig(object):
-    def __init__(self, send_anonymous_usage_stats, use_colors, printer_width):
-        self.send_anonymous_usage_stats = send_anonymous_usage_stats
-        self.use_colors = use_colors
-        self.printer_width = printer_width
-
-    @classmethod
-    def from_dict(cls, cfg=None):
-        if cfg is None:
-            cfg = {}
-        send_anonymous_usage_stats = cfg.get(
-            'send_anonymous_usage_stats',
-            DEFAULT_SEND_ANONYMOUS_USAGE_STATS
-        )
-        use_colors = cfg.get(
-            'use_colors',
-            DEFAULT_USE_COLORS
-        )
-        printer_width = cfg.get(
-            'printer_width'
-        )
-        return cls(send_anonymous_usage_stats, use_colors, printer_width)
-
-    def to_dict(self):
-        return {
-            'send_anonymous_usage_stats': self.send_anonymous_usage_stats,
-            'use_colors': self.use_colors,
-        }
-
-    @classmethod
-    def from_directory(cls, directory):
-        user_cfg = None
+def read_user_config(directory: str) -> UserConfig:
+    try:
         profile = read_profile(directory)
         if profile:
-            user_cfg = profile.get('config', {})
-        return cls.from_dict(user_cfg)
-
-    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:
-            printer.use_colors()
-
-        if self.printer_width:
-            printer.printer_width(self.printer_width)
+            user_cfg = coerce_dict_str(profile.get('config', {}))
+            if user_cfg is not None:
+                return UserConfig.from_dict(user_cfg)
+    except (RuntimeException, ValidationError):
+        pass
+    return UserConfig()
 
 
-class Profile(object):
-    def __init__(self, profile_name, target_name, config, threads,
-                 credentials):
-        self.profile_name = profile_name
-        self.target_name = target_name
-        if isinstance(config, dict):
-            config = UserConfig.from_dict(config)
-        self.config = config
-        self.threads = threads
-        self.credentials = credentials
+# The Profile class is included in RuntimeConfig, so any attribute
+# additions must also be set where the RuntimeConfig class is created
+@dataclass
+class Profile(HasCredentials):
+    profile_name: str
+    target_name: str
+    config: UserConfig
+    threads: int
+    credentials: Credentials
 
-    def to_profile_info(self, serialize_credentials=False):
+    def to_profile_info(
+        self, serialize_credentials: bool = False
+    ) -> Dict[str, Any]:
         """Unlike to_project_config, this dict is not a mirror of any existing
         on-disk data structure. It's used when creating a new profile from an
         existing one.
@@ -133,34 +105,51 @@ class Profile(object):
         result = {
             'profile_name': self.profile_name,
             'target_name': self.target_name,
-            'config': self.config.to_dict(),
+            'config': self.config,
             'threads': self.threads,
-            'credentials': self.credentials.incorporate(),
+            'credentials': self.credentials,
         }
         if serialize_credentials:
-            result['credentials'] = result['credentials'].serialize()
+            result['config'] = self.config.to_dict()
+            result['credentials'] = self.credentials.to_dict()
         return result
 
-    def __str__(self):
-        return pprint.pformat(self.to_profile_info())
+    def to_target_dict(self) -> Dict[str, Any]:
+        target = dict(
+            self.credentials.connection_info(with_aliases=True)
+        )
+        target.update({
+            'type': self.credentials.type,
+            'threads': self.threads,
+            'name': self.target_name,
+            'target_name': self.target_name,
+            'profile_name': self.profile_name,
+            'config': self.config.to_dict(),
+        })
+        return target
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
         if not (isinstance(other, self.__class__) and
                 isinstance(self, other.__class__)):
-            return False
-            return False
+            return NotImplemented
         return self.to_profile_info() == other.to_profile_info()
 
     def validate(self):
-        if self.credentials:
-            self.credentials.validate()
         try:
-            ProfileConfig(**self.to_profile_info(serialize_credentials=True))
-        except ValidationException as exc:
-            raise DbtProfileError(str(exc))
+            if self.credentials:
+                self.credentials.to_dict(validate=True)
+            ProfileConfig.from_dict(
+                self.to_profile_info(serialize_credentials=True)
+            )
+        except ValidationError as exc:
+            raise DbtProfileError(validator_error_message(exc)) from exc
 
     @staticmethod
-    def _credentials_from_profile(profile, profile_name, target_name):
+    def _credentials_from_profile(
+        profile: Dict[str, Any], profile_name: str, target_name: str
+    ) -> Credentials:
+        # avoid an import cycle
+        from dbt.adapters.factory import load_plugin
         # credentials carry their 'type' in their actual type, not their
         # attributes. We do want this in order to pick our Credentials class.
         if 'type' not in profile:
@@ -169,19 +158,23 @@ class Profile(object):
                 .format(profile_name, target_name))
 
         typename = profile.pop('type')
-
         try:
             cls = load_plugin(typename)
-            credentials = cls(**profile)
-        except RuntimeException as e:
+            credentials = cls.from_dict(profile)
+        except (RuntimeException, ValidationError) as e:
+            msg = str(e) if isinstance(e, RuntimeException) else e.message
             raise DbtProfileError(
                 'Credentials in profile "{}", target "{}" invalid: {}'
-                .format(profile_name, target_name, str(e))
-            )
+                .format(profile_name, target_name, msg)
+            ) from e
+
         return credentials
 
     @staticmethod
-    def pick_profile_name(args_profile_name, project_profile_name=None):
+    def pick_profile_name(
+        args_profile_name: Optional[str],
+        project_profile_name: Optional[str] = None,
+    ) -> str:
         profile_name = project_profile_name
         if args_profile_name is not None:
             profile_name = args_profile_name
@@ -190,7 +183,9 @@ class Profile(object):
         return profile_name
 
     @staticmethod
-    def _get_profile_data(profile, profile_name, target_name):
+    def _get_profile_data(
+        profile: Dict[str, Any], profile_name: str, target_name: str
+    ) -> Dict[str, Any]:
         if 'outputs' not in profile:
             raise DbtProfileError(
                 "outputs not specified in profile '{}'".format(profile_name)
@@ -205,24 +200,41 @@ class Profile(object):
                    .format(profile_name, target_name, outputs))
             raise DbtProfileError(msg, result_type='invalid_target')
         profile_data = outputs[target_name]
+
+        if not isinstance(profile_data, dict):
+            msg = (
+                f"output '{target_name}' of profile '{profile_name}' is "
+                f"misconfigured in profiles.yml"
+            )
+            raise DbtProfileError(msg, result_type='invalid_target')
+
         return profile_data
 
     @classmethod
-    def from_credentials(cls, credentials, threads, profile_name, target_name,
-                         user_cfg=None):
+    def from_credentials(
+        cls,
+        credentials: Credentials,
+        threads: int,
+        profile_name: str,
+        target_name: str,
+        user_cfg: Optional[Dict[str, Any]] = None
+    ) -> 'Profile':
         """Create a profile from an existing set of Credentials and the
         remaining information.
 
-        :param credentials dict: The credentials dict for this profile.
-        :param threads int: The number of threads to use for connections.
-        :param profile_name str: The profile name used for this profile.
-        :param target_name str: The target name used for this profile.
-        :param user_cfg Optional[dict]: The user-level config block from the
+        :param credentials: The credentials dict for this profile.
+        :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
             raw profiles, if specified.
         :raises DbtProfileError: If the profile is invalid.
-        :returns Profile: The new Profile object.
+        :returns: The new Profile object.
         """
+        if user_cfg is None:
+            user_cfg = {}
         config = UserConfig.from_dict(user_cfg)
+
         profile = cls(
             profile_name=profile_name,
             target_name=target_name,
@@ -234,13 +246,16 @@ class Profile(object):
         return profile
 
     @classmethod
-    def render_profile(cls, raw_profile, profile_name, target_override,
-                       cli_vars):
+    def render_profile(
+        cls,
+        raw_profile: Dict[str, Any],
+        profile_name: str,
+        target_override: Optional[str],
+        renderer: ProfileRenderer,
+    ) -> Tuple[str, Dict[str, Any]]:
         """This is a containment zone for the hateful way we're rendering
         profiles.
         """
-        renderer = ConfigRenderer(cli_vars=cli_vars)
-
         # rendering profiles is a bit complex. Two constraints cause trouble:
         # 1) users should be able to use environment/cli variables to specify
         #    the target in their profile.
@@ -264,36 +279,46 @@ class Profile(object):
             raw_profile, profile_name, target_name
         )
 
-        profile_data = renderer.render_profile_data(raw_profile_data)
+        try:
+            profile_data = renderer.render_data(raw_profile_data)
+        except CompilationException as exc:
+            raise DbtProfileError(str(exc)) from exc
         return target_name, profile_data
 
     @classmethod
-    def from_raw_profile_info(cls, raw_profile, profile_name, cli_vars,
-                              user_cfg=None, target_override=None,
-                              threads_override=None):
+    def from_raw_profile_info(
+        cls,
+        raw_profile: Dict[str, Any],
+        profile_name: str,
+        renderer: ProfileRenderer,
+        user_cfg: Optional[Dict[str, Any]] = None,
+        target_override: Optional[str] = None,
+        threads_override: Optional[int] = None,
+    ) -> 'Profile':
         """Create a profile from its raw profile information.
 
          (this is an intermediate step, mostly useful for unit testing)
 
-        :param raw_profile dict: The profile data for a single profile, from
+        :param raw_profile: The profile data for a single profile, from
             disk as yaml and its values rendered with jinja.
-        :param profile_name str: The profile name used.
-        :param cli_vars dict: The command-line variables passed as arguments,
-            as a dict.
-        :param user_cfg Optional[dict]: The global config for the user, if it
+        :param profile_name: The profile name used.
+        :param renderer: The config renderer.
+        :param user_cfg: The global config for the user, if it
             was present.
-        :param target_override Optional[str]: The target to use, if provided on
+        :param target_override: The target to use, if provided on
             the command line.
-        :param threads_override Optional[str]: The thread count to use, if
+        :param threads_override: The thread count to use, if
             provided on the command line.
         :raises DbtProfileError: If the profile is invalid or missing, or the
             target could not be found
-        :returns Profile: The new Profile object.
+        :returns: The new Profile object.
         """
-        # user_cfg is not rendered since it only contains booleans.
+        # user_cfg is not rendered.
+        if user_cfg is None:
+            user_cfg = 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, cli_vars
+            raw_profile, profile_name, target_override, renderer
         )
 
         # valid connections never include the number of threads, but it's
@@ -302,7 +327,7 @@ class Profile(object):
         if threads_override is not None:
             threads = threads_override
 
-        credentials = cls._credentials_from_profile(
+        credentials: Credentials = cls._credentials_from_profile(
             profile_data, profile_name, target_name
         )
 
@@ -315,22 +340,27 @@ class Profile(object):
         )
 
     @classmethod
-    def from_raw_profiles(cls, raw_profiles, profile_name, cli_vars,
-                          target_override=None, threads_override=None):
+    def from_raw_profiles(
+        cls,
+        raw_profiles: Dict[str, Any],
+        profile_name: str,
+        renderer: ProfileRenderer,
+        target_override: Optional[str] = None,
+        threads_override: Optional[int] = None,
+    ) -> 'Profile':
         """
-        :param raw_profiles dict: The profile data, from disk as yaml.
-        :param profile_name str: The profile name to use.
-        :param cli_vars dict: The command-line variables passed as arguments,
-            as a dict.
-        :param target_override Optional[str]: The target to use, if provided on
-            the command line.
-        :param threads_override Optional[str]: The thread count to use, if
-            provided on the command line.
+        :param raw_profiles: The profile data, from disk as yaml.
+        :param profile_name: The profile name to use.
+        :param renderer: The config renderer.
+        :param target_override: The target to use, if provided on the command
+            line.
+        :param threads_override: The thread count to use, if provided on the
+            command line.
         :raises DbtProjectError: If there is no profile name specified in the
             project or the command line arguments
         :raises DbtProfileError: If the profile is invalid or missing, or the
             target could not be found
-        :returns Profile: The new Profile object.
+        :returns: The new Profile object.
         """
         if profile_name not in raw_profiles:
             raise DbtProjectError(
@@ -340,20 +370,33 @@ class Profile(object):
         # First, we've already got our final decision on profile name, and we
         # don't render keys, so we can pluck that out
         raw_profile = raw_profiles[profile_name]
-
+        if not raw_profile:
+            msg = (
+                f'Profile {profile_name} in profiles.yml is empty'
+            )
+            raise DbtProfileError(
+                INVALID_PROFILE_MESSAGE.format(
+                    error_string=msg
+                )
+            )
         user_cfg = raw_profiles.get('config')
 
         return cls.from_raw_profile_info(
             raw_profile=raw_profile,
             profile_name=profile_name,
-            cli_vars=cli_vars,
+            renderer=renderer,
             user_cfg=user_cfg,
             target_override=target_override,
             threads_override=threads_override,
         )
 
     @classmethod
-    def from_args(cls, args, project_profile_name=None):
+    def render_from_args(
+        cls,
+        args: Any,
+        renderer: ProfileRenderer,
+        project_profile_name: Optional[str],
+    ) -> 'Profile':
         """Given the raw profiles as read from disk and the name of the desired
         profile if specified, return the profile component of the runtime
         config.
@@ -368,17 +411,15 @@ class Profile(object):
             target could not be found.
         :returns Profile: The new Profile object.
         """
-        cli_vars = parse_cli_vars(getattr(args, 'vars', '{}'))
         threads_override = getattr(args, 'threads', None)
         target_override = getattr(args, 'target', None)
         raw_profiles = read_profile(args.profiles_dir)
-        profile_name = cls.pick_profile_name(args.profile,
+        profile_name = cls.pick_profile_name(getattr(args, 'profile', None),
                                              project_profile_name)
-
         return cls.from_raw_profiles(
             raw_profiles=raw_profiles,
             profile_name=profile_name,
-            cli_vars=cli_vars,
+            renderer=renderer,
             target_override=target_override,
             threads_override=threads_override
         )

core/dbt/config/project.py

@@ -1,37 +1,46 @@
 from copy import deepcopy
+from dataclasses import dataclass, field
+from itertools import chain
+from typing import (
+    List, Dict, Any, Optional, TypeVar, Union, Mapping,
+)
+from typing_extensions import Protocol, runtime_checkable
+
 import hashlib
 import os
-import pprint
 
-from dbt import compat
 from dbt.clients.system import resolve_path_from_base
 from dbt.clients.system import path_exists
 from dbt.clients.system import load_file_contents
 from dbt.clients.yaml_helper import load_yaml_text
+from dbt.contracts.connection import QueryComment
 from dbt.exceptions import DbtProjectError
-from dbt.exceptions import RecursionException
 from dbt.exceptions import SemverException
-from dbt.exceptions import ValidationException
-from dbt.exceptions import warn_or_error
+from dbt.exceptions import validator_error_message
+from dbt.exceptions import RuntimeException
+from dbt.graph import SelectionSpec
+from dbt.helper_types import NoValue
 from dbt.semver import VersionSpecifier
 from dbt.semver import versions_compatible
 from dbt.version import get_installed_version
-from dbt.ui import printer
-from dbt.utils import deep_map
-from dbt.utils import parse_cli_vars
-from dbt.parser.source_config import SourceConfig
+from dbt.utils import MultiDict
+from dbt.node_types import NodeType
+from dbt.config.selectors import SelectorDict
 
-from dbt.contracts.project import Project as ProjectContract
+from dbt.contracts.project import (
+    Project as ProjectContract,
+    SemverString,
+)
 from dbt.contracts.project import PackageConfig
 
-from .renderer import ConfigRenderer
+from hologram import ValidationError
 
-
-UNUSED_RESOURCE_CONFIGURATION_PATH_MESSAGE = """\
-WARNING: Configuration paths exist in your dbt_project.yml file which do not \
-apply to any resources.
-There are {} unused configuration paths:\n{}
-"""
+from .renderer import DbtProjectYamlRenderer
+from .selectors import (
+    selector_config_from_data,
+    selector_data_from_root,
+    SelectorConfig,
+)
 
 
 INVALID_VERSION_ERROR = """\
@@ -51,24 +60,23 @@ Check the requirements for the '{package}' package, or run dbt again with \
 --no-version-check
 """
 
+MALFORMED_PACKAGE_ERROR = """\
+The packages.yml file in this project is malformed. Please double check
+the contents of this file and fix any errors before retrying.
 
-def _list_if_none(value):
-    if value is None:
-        value = []
-    return value
+You can find more information on the syntax for this file here:
+https://docs.getdbt.com/docs/package-management
+
+Validator Error:
+{error}
+"""
 
 
-def _dict_if_none(value):
-    if value is None:
-        value = {}
-    return value
-
-
-def _list_if_none_or_string(value):
-    value = _list_if_none(value)
-    if isinstance(value, compat.basestring):
-        return [value]
-    return value
+@runtime_checkable
+class IsFQNResource(Protocol):
+    fqn: List[str]
+    resource_type: NodeType
+    package_name: str
 
 
 def _load_yaml(path):
@@ -76,32 +84,6 @@ def _load_yaml(path):
     return load_yaml_text(contents)
 
 
-def _get_config_paths(config, path=(), paths=None):
-    if paths is None:
-        paths = set()
-
-    for key, value in config.items():
-        if isinstance(value, dict):
-            if key in SourceConfig.ConfigKeys:
-                if path not in paths:
-                    paths.add(path)
-            else:
-                _get_config_paths(value, path + (key,), paths)
-        else:
-            if path not in paths:
-                paths.add(path)
-
-    return frozenset(paths)
-
-
-def _is_config_used(path, fqns):
-    if fqns:
-        for fqn in fqns:
-            if len(path) <= len(fqn) and fqn[:len(path)] == path:
-                return True
-    return False
-
-
 def package_data_from_root(project_root):
     package_filepath = resolve_path_from_base(
         'packages.yml', project_root
@@ -114,18 +96,20 @@ def package_data_from_root(project_root):
     return packages_dict
 
 
-def package_config_from_data(packages_data):
-    if packages_data is None:
+def package_config_from_data(packages_data: Dict[str, Any]):
+    if not packages_data:
         packages_data = {'packages': []}
 
     try:
-        packages = PackageConfig(**packages_data)
-    except ValidationException as e:
-        raise DbtProjectError('Invalid package config: {}'.format(str(e)))
+        packages = PackageConfig.from_dict(packages_data)
+    except ValidationError as e:
+        raise DbtProjectError(
+            MALFORMED_PACKAGE_ERROR.format(error=str(e.message))
+        ) from e
     return packages
 
 
-def _parse_versions(versions):
+def _parse_versions(versions: Union[List[str], str]) -> List[VersionSpecifier]:
     """Parse multiple versions as read from disk. The versions value may be any
     one of:
         - a single version string ('>0.12.1')
@@ -135,135 +119,266 @@ def _parse_versions(versions):
 
     Regardless, this will return a list of VersionSpecifiers
     """
-    if isinstance(versions, compat.basestring):
+    if isinstance(versions, str):
         versions = versions.split(',')
     return [VersionSpecifier.from_version_string(v) for v in versions]
 
 
-class Project(object):
-    def __init__(self, project_name, version, project_root, profile_name,
-                 source_paths, macro_paths, data_paths, test_paths,
-                 analysis_paths, docs_paths, target_path, snapshot_paths,
-                 clean_targets, log_path, modules_path, quoting, models,
-                 on_run_start, on_run_end, archive, seeds, dbt_version,
-                 packages):
-        self.project_name = project_name
-        self.version = version
-        self.project_root = project_root
-        self.profile_name = profile_name
-        self.source_paths = source_paths
-        self.macro_paths = macro_paths
-        self.data_paths = data_paths
-        self.test_paths = test_paths
-        self.analysis_paths = analysis_paths
-        self.docs_paths = docs_paths
-        self.target_path = target_path
-        self.snapshot_paths = snapshot_paths
-        self.clean_targets = clean_targets
-        self.log_path = log_path
-        self.modules_path = modules_path
-        self.quoting = quoting
-        self.models = models
-        self.on_run_start = on_run_start
-        self.on_run_end = on_run_end
-        self.archive = archive
-        self.seeds = seeds
-        self.dbt_version = dbt_version
-        self.packages = packages
+def _all_source_paths(
+    source_paths: List[str],
+    data_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,
+                      macro_paths))
 
-    @staticmethod
-    def _preprocess(project_dict):
-        """Pre-process certain special keys to convert them from None values
-        into empty containers, and to turn strings into arrays of strings.
-        """
-        handlers = {
-            ('archive',): _list_if_none,
-            ('on-run-start',): _list_if_none_or_string,
-            ('on-run-end',): _list_if_none_or_string,
-        }
 
-        for k in ('models', 'seeds'):
-            handlers[(k,)] = _dict_if_none
-            handlers[(k, 'vars')] = _dict_if_none
-            handlers[(k, 'pre-hook')] = _list_if_none_or_string
-            handlers[(k, 'post-hook')] = _list_if_none_or_string
-        handlers[('seeds', 'column_types')] = _dict_if_none
+T = TypeVar('T')
 
-        def converter(value, keypath):
-            if keypath in handlers:
-                handler = handlers[keypath]
-                return handler(value)
-            else:
-                return value
 
-        return deep_map(converter, project_dict)
+def value_or(value: Optional[T], default: T) -> T:
+    if value is None:
+        return default
+    else:
+        return value
 
-    @classmethod
-    def from_project_config(cls, project_dict, packages_dict=None):
-        """Create a project from its project and package configuration, as read
-        by yaml.safe_load().
 
-        :param project_dict dict: The dictionary as read from disk
-        :param packages_dict Optional[dict]: If it exists, the packages file as
-            read from disk.
-        :raises DbtProjectError: If the project is missing or invalid, or if
-            the packages file exists and is invalid.
-        :returns Project: The project, with defaults populated.
-        """
-        try:
-            project_dict = cls._preprocess(project_dict)
-        except RecursionException:
+def _raw_project_from(project_root: str) -> Dict[str, Any]:
+
+    project_root = os.path.normpath(project_root)
+    project_yaml_filepath = os.path.join(project_root, 'dbt_project.yml')
+
+    # get the project.yml contents
+    if not path_exists(project_yaml_filepath):
+        raise DbtProjectError(
+            'no dbt_project.yml found at expected path {}'
+            .format(project_yaml_filepath)
+        )
+
+    project_dict = _load_yaml(project_yaml_filepath)
+
+    if not isinstance(project_dict, dict):
+        raise DbtProjectError(
+            'dbt_project.yml does not parse to a dictionary'
+        )
+
+    return project_dict
+
+
+def _query_comment_from_cfg(
+        cfg_query_comment: Union[QueryComment, NoValue, str, None]
+) -> QueryComment:
+    if not cfg_query_comment:
+        return QueryComment(comment='')
+
+    if isinstance(cfg_query_comment, str):
+        return QueryComment(comment=cfg_query_comment)
+
+    if isinstance(cfg_query_comment, NoValue):
+        return QueryComment()
+
+    return cfg_query_comment
+
+
+def validate_version(dbt_version: List[VersionSpecifier], project_name: str):
+    """Ensure this package works with the installed version of dbt."""
+    installed = get_installed_version()
+    if not versions_compatible(*dbt_version):
+        msg = IMPOSSIBLE_VERSION_ERROR.format(
+            package=project_name,
+            version_spec=[
+                x.to_version_string() for x in dbt_version
+            ]
+        )
+        raise DbtProjectError(msg)
+
+    if not versions_compatible(installed, *dbt_version):
+        msg = INVALID_VERSION_ERROR.format(
+            package=project_name,
+            installed=installed.to_version_string(),
+            version_spec=[
+                x.to_version_string() for x in dbt_version
+            ]
+        )
+        raise DbtProjectError(msg)
+
+
+def _get_required_version(
+    project_dict: Dict[str, Any],
+    verify_version: bool,
+) -> List[VersionSpecifier]:
+    dbt_raw_version: Union[List[str], str] = '>=0.0.0'
+    required = project_dict.get('require-dbt-version')
+    if required is not None:
+        dbt_raw_version = required
+
+    try:
+        dbt_version = _parse_versions(dbt_raw_version)
+    except SemverException as e:
+        raise DbtProjectError(str(e)) from e
+
+    if verify_version:
+        # no name is also an error that we want to raise
+        if 'name' not in project_dict:
             raise DbtProjectError(
-                'Cycle detected: Project input has a reference to itself',
-                project=project_dict
+                'Required "name" field not present in project',
             )
-        # just for validation.
-        try:
-            ProjectContract(**project_dict)
-        except ValidationException as e:
-            raise DbtProjectError(str(e))
+        validate_version(dbt_version, project_dict['name'])
 
+    return dbt_version
+
+
+@dataclass
+class RenderComponents:
+    project_dict: Dict[str, Any] = field(
+        metadata=dict(description='The project dictionary')
+    )
+    packages_dict: Dict[str, Any] = field(
+        metadata=dict(description='The packages dictionary')
+    )
+    selectors_dict: Dict[str, Any] = field(
+        metadata=dict(description='The selectors dictionary')
+    )
+
+
+@dataclass
+class PartialProject(RenderComponents):
+    profile_name: Optional[str] = field(metadata=dict(
+        description='The unrendered profile name in the project, if set'
+    ))
+    project_name: Optional[str] = field(metadata=dict(
+        description=(
+            'The name of the project. This should always be set and will not '
+            'be rendered'
+        )
+    ))
+    project_root: str = field(
+        metadata=dict(description='The root directory of the project'),
+    )
+    verify_version: bool = field(
+        metadata=dict(description=(
+            'If True, verify the dbt version matches the required version'
+        ))
+    )
+
+    def render_profile_name(self, renderer) -> Optional[str]:
+        if self.profile_name is None:
+            return None
+        return renderer.render_value(self.profile_name)
+
+    def get_rendered(
+        self,
+        renderer: DbtProjectYamlRenderer,
+    ) -> RenderComponents:
+
+        rendered_project = renderer.render_project(
+            self.project_dict, self.project_root
+        )
+        rendered_packages = renderer.render_packages(self.packages_dict)
+        rendered_selectors = renderer.render_selectors(self.selectors_dict)
+
+        return RenderComponents(
+            project_dict=rendered_project,
+            packages_dict=rendered_packages,
+            selectors_dict=rendered_selectors,
+        )
+
+    def render(self, renderer: DbtProjectYamlRenderer) -> 'Project':
+        try:
+            rendered = self.get_rendered(renderer)
+            return self.create_project(rendered)
+        except DbtProjectError as exc:
+            if exc.path is None:
+                exc.path = os.path.join(self.project_root, 'dbt_project.yml')
+            raise
+
+    def create_project(self, rendered: RenderComponents) -> 'Project':
+        unrendered = RenderComponents(
+            project_dict=self.project_dict,
+            packages_dict=self.packages_dict,
+            selectors_dict=self.selectors_dict,
+        )
+        dbt_version = _get_required_version(
+            rendered.project_dict,
+            verify_version=self.verify_version,
+        )
+
+        try:
+            cfg = ProjectContract.from_dict(rendered.project_dict)
+        except ValidationError as e:
+            raise DbtProjectError(validator_error_message(e)) from e
         # name/version are required in the Project definition, so we can assume
         # they are present
-        name = project_dict['name']
-        version = project_dict['version']
+        name = cfg.name
+        version = cfg.version
         # this is added at project_dict parse time and should always be here
         # once we see it.
-        project_root = project_dict['project-root']
+        if cfg.project_root is None:
+            raise DbtProjectError('cfg must have a project root!')
+        else:
+            project_root = cfg.project_root
         # this is only optional in the sense that if it's not present, it needs
         # to have been a cli argument.
-        profile_name = project_dict.get('profile')
-        # these are optional
-        source_paths = project_dict.get('source-paths', ['models'])
-        macro_paths = project_dict.get('macro-paths', ['macros'])
-        data_paths = project_dict.get('data-paths', ['data'])
-        test_paths = project_dict.get('test-paths', ['test'])
-        analysis_paths = project_dict.get('analysis-paths', [])
-        docs_paths = project_dict.get('docs-paths', source_paths[:])
-        target_path = project_dict.get('target-path', 'target')
-        snapshot_paths = project_dict.get('snapshot-paths', ['snapshots'])
-        # should this also include the modules path by default?
-        clean_targets = project_dict.get('clean-targets', [target_path])
-        log_path = project_dict.get('log-path', 'logs')
-        modules_path = project_dict.get('modules-path', 'dbt_modules')
+        profile_name = cfg.profile
+        # these are all the defaults
+        source_paths: List[str] = value_or(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, [])
+        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,
+            macro_paths
+        )
+
+        docs_paths: List[str] = value_or(cfg.docs_paths, all_source_paths)
+        asset_paths: List[str] = value_or(cfg.asset_paths, [])
+        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')
         # in the default case we'll populate this once we know the adapter type
-        quoting = project_dict.get('quoting', {})
+        # It would be nice to just pass along a Quoting here, but that would
+        # break many things
+        quoting: Dict[str, Any] = {}
+        if cfg.quoting is not None:
+            quoting = cfg.quoting.to_dict()
 
-        models = project_dict.get('models', {})
-        on_run_start = project_dict.get('on-run-start', [])
-        on_run_end = project_dict.get('on-run-end', [])
-        archive = project_dict.get('archive', [])
-        seeds = project_dict.get('seeds', {})
-        dbt_raw_version = project_dict.get('require-dbt-version', '>=0.0.0')
+        models: Dict[str, Any]
+        seeds: Dict[str, Any]
+        snapshots: Dict[str, Any]
+        sources: Dict[str, Any]
+        vars_value: VarProvider
 
-        try:
-            dbt_version = _parse_versions(dbt_raw_version)
-        except SemverException as e:
-            raise DbtProjectError(str(e))
+        models = cfg.models
+        seeds = cfg.seeds
+        snapshots = cfg.snapshots
+        sources = cfg.sources
+        if cfg.vars is None:
+            vars_dict: Dict[str, Any] = {}
+        else:
+            vars_dict = cfg.vars
 
-        packages = package_config_from_data(packages_dict)
+        vars_value = VarProvider(vars_dict)
+        on_run_start: List[str] = value_or(cfg.on_run_start, [])
+        on_run_end: List[str] = value_or(cfg.on_run_end, [])
 
-        project = cls(
+        query_comment = _query_comment_from_cfg(cfg.query_comment)
+
+        packages = package_config_from_data(rendered.packages_dict)
+        selectors = selector_config_from_data(rendered.selectors_dict)
+        manifest_selectors: Dict[str, Any] = {}
+        if rendered.selectors_dict and rendered.selectors_dict['selectors']:
+            # this is a dict with a single key 'selectors' pointing to a list
+            # of dicts.
+            manifest_selectors = SelectorDict.parse_from_selectors_list(
+                rendered.selectors_dict['selectors'])
+
+        project = Project(
             project_name=name,
             version=version,
             project_root=project_root,
@@ -274,6 +389,7 @@ class Project(object):
             test_paths=test_paths,
             analysis_paths=analysis_paths,
             docs_paths=docs_paths,
+            asset_paths=asset_paths,
             target_path=target_path,
             snapshot_paths=snapshot_paths,
             clean_targets=clean_targets,
@@ -283,18 +399,138 @@ class Project(object):
             models=models,
             on_run_start=on_run_start,
             on_run_end=on_run_end,
-            archive=archive,
             seeds=seeds,
+            snapshots=snapshots,
             dbt_version=dbt_version,
-            packages=packages
+            packages=packages,
+            manifest_selectors=manifest_selectors,
+            selectors=selectors,
+            query_comment=query_comment,
+            sources=sources,
+            vars=vars_value,
+            config_version=cfg.config_version,
+            unrendered=unrendered,
         )
         # sanity check - this means an internal issue
         project.validate()
         return project
 
+    @classmethod
+    def from_dicts(
+        cls,
+        project_root: str,
+        project_dict: Dict[str, Any],
+        packages_dict: Dict[str, Any],
+        selectors_dict: Dict[str, Any],
+        *,
+        verify_version: bool = False,
+    ):
+        """Construct a partial project from its constituent dicts.
+        """
+        project_name = project_dict.get('name')
+        profile_name = project_dict.get('profile')
+
+        return cls(
+            profile_name=profile_name,
+            project_name=project_name,
+            project_root=project_root,
+            project_dict=project_dict,
+            packages_dict=packages_dict,
+            selectors_dict=selectors_dict,
+            verify_version=verify_version,
+        )
+
+    @classmethod
+    def from_project_root(
+        cls, project_root: str, *, verify_version: bool = False
+    ) -> 'PartialProject':
+        project_root = os.path.normpath(project_root)
+        project_dict = _raw_project_from(project_root)
+        config_version = project_dict.get('config-version', 1)
+        if config_version != 2:
+            raise DbtProjectError(
+                f'Invalid config version: {config_version}, expected 2',
+                path=os.path.join(project_root, 'dbt_project.yml')
+            )
+
+        packages_dict = package_data_from_root(project_root)
+        selectors_dict = selector_data_from_root(project_root)
+        return cls.from_dicts(
+            project_root=project_root,
+            project_dict=project_dict,
+            selectors_dict=selectors_dict,
+            packages_dict=packages_dict,
+            verify_version=verify_version,
+        )
+
+
+class VarProvider:
+    """Var providers are tied to a particular Project."""
+
+    def __init__(
+        self,
+        vars: Dict[str, Dict[str, Any]]
+    ) -> None:
+        self.vars = vars
+
+    def vars_for(
+        self, node: IsFQNResource, adapter_type: str
+    ) -> Mapping[str, Any]:
+        # in v2, vars are only either project or globally scoped
+        merged = MultiDict([self.vars])
+        merged.add(self.vars.get(node.package_name, {}))
+        return merged
+
+    def to_dict(self):
+        return self.vars
+
+
+# The Project class is included in RuntimeConfig, so any attribute
+# additions must also be set where the RuntimeConfig class is created
+@dataclass
+class Project:
+    project_name: str
+    version: Union[SemverString, float]
+    project_root: str
+    profile_name: Optional[str]
+    source_paths: List[str]
+    macro_paths: List[str]
+    data_paths: List[str]
+    test_paths: List[str]
+    analysis_paths: List[str]
+    docs_paths: List[str]
+    asset_paths: List[str]
+    target_path: str
+    snapshot_paths: List[str]
+    clean_targets: List[str]
+    log_path: str
+    modules_path: str
+    quoting: Dict[str, Any]
+    models: Dict[str, Any]
+    on_run_start: List[str]
+    on_run_end: List[str]
+    seeds: Dict[str, Any]
+    snapshots: Dict[str, Any]
+    sources: Dict[str, Any]
+    vars: VarProvider
+    dbt_version: List[VersionSpecifier]
+    packages: Dict[str, Any]
+    manifest_selectors: Dict[str, Any]
+    selectors: SelectorConfig
+    query_comment: QueryComment
+    config_version: int
+    unrendered: RenderComponents
+
+    @property
+    def all_source_paths(self) -> List[str]:
+        return _all_source_paths(
+            self.source_paths, self.data_paths, self.snapshot_paths,
+            self.analysis_paths, self.macro_paths
+        )
+
     def __str__(self):
         cfg = self.to_project_config(with_packages=True)
-        return pprint.pformat(cfg)
+        return str(cfg)
 
     def __eq__(self, other):
         if not (isinstance(other, self.__class__) and
@@ -322,6 +558,7 @@ class Project(object):
             'test-paths': self.test_paths,
             'analysis-paths': self.analysis_paths,
             'docs-paths': self.docs_paths,
+            'asset-paths': self.asset_paths,
             'target-path': self.target_path,
             'snapshot-paths': self.snapshot_paths,
             'clean-targets': self.clean_targets,
@@ -330,121 +567,76 @@ class Project(object):
             'models': self.models,
             'on-run-start': self.on_run_start,
             'on-run-end': self.on_run_end,
-            'archive': self.archive,
             'seeds': self.seeds,
+            'snapshots': self.snapshots,
+            'sources': self.sources,
+            'vars': self.vars.to_dict(),
             'require-dbt-version': [
                 v.to_version_string() for v in self.dbt_version
             ],
+            'config-version': self.config_version,
         })
+        if self.query_comment:
+            result['query-comment'] = self.query_comment.to_dict()
+
         if with_packages:
-            result.update(self.packages.serialize())
+            result.update(self.packages.to_dict())
+
         return result
 
     def validate(self):
         try:
-            ProjectContract(**self.to_project_config())
-        except ValidationException as exc:
-            raise DbtProjectError(str(exc))
+            ProjectContract.from_dict(self.to_project_config())
+        except ValidationError as e:
+            raise DbtProjectError(validator_error_message(e)) from e
 
     @classmethod
-    def from_project_root(cls, project_root, cli_vars):
-        """Create a project from a root directory. Reads in dbt_project.yml and
-        packages.yml, if it exists.
-
-        :param project_root str: The path to the project root to load.
-        :raises DbtProjectError: If the project is missing or invalid, or if
-            the packages file exists and is invalid.
-        :returns Project: The project, with defaults populated.
-        """
-        project_root = os.path.normpath(project_root)
-        project_yaml_filepath = os.path.join(project_root, 'dbt_project.yml')
-
-        # get the project.yml contents
-        if not path_exists(project_yaml_filepath):
-            raise DbtProjectError(
-                'no dbt_project.yml found at expected path {}'
-                .format(project_yaml_filepath)
-            )
-
-        if isinstance(cli_vars, compat.basestring):
-            cli_vars = parse_cli_vars(cli_vars)
-        renderer = ConfigRenderer(cli_vars)
-
-        project_dict = _load_yaml(project_yaml_filepath)
-        rendered_project = renderer.render_project(project_dict)
-        rendered_project['project-root'] = project_root
-        packages_dict = package_data_from_root(project_root)
-        return cls.from_project_config(rendered_project, packages_dict)
+    def partial_load(
+        cls, project_root: str, *, verify_version: bool = False
+    ) -> PartialProject:
+        return PartialProject.from_project_root(
+            project_root,
+            verify_version=verify_version,
+        )
 
     @classmethod
-    def from_current_directory(cls, cli_vars):
-        return cls.from_project_root(os.getcwd(), cli_vars)
+    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_args(cls, args):
-        return cls.from_current_directory(getattr(args, 'vars', '{}'))
+    def from_project_root(
+        cls,
+        project_root: str,
+        renderer: DbtProjectYamlRenderer,
+        *,
+        verify_version: bool = False,
+    ) -> 'Project':
+        partial = cls.partial_load(project_root, verify_version=verify_version)
+        return partial.render(renderer)
 
     def hashed_name(self):
         return hashlib.md5(self.project_name.encode('utf-8')).hexdigest()
 
-    def get_resource_config_paths(self):
-        """Return a dictionary with 'seeds' and 'models' keys whose values are
-        lists of lists of strings, where each inner list of strings represents
-        a configured path in the resource.
-        """
-        return {
-            'models': _get_config_paths(self.models),
-            'seeds': _get_config_paths(self.seeds),
-        }
-
-    def get_unused_resource_config_paths(self, resource_fqns, disabled):
-        """Return a list of lists of strings, where each inner list of strings
-        represents a type + FQN path of a resource configuration that is not
-        used.
-        """
-        disabled_fqns = frozenset(tuple(fqn) for fqn in disabled)
-        resource_config_paths = self.get_resource_config_paths()
-        unused_resource_config_paths = []
-        for resource_type, config_paths in resource_config_paths.items():
-            used_fqns = resource_fqns.get(resource_type, frozenset())
-            fqns = used_fqns | disabled_fqns
-
-            for config_path in config_paths:
-                if not _is_config_used(config_path, fqns):
-                    unused_resource_config_paths.append(
-                        (resource_type,) + config_path
-                    )
-        return unused_resource_config_paths
-
-    def warn_for_unused_resource_config_paths(self, resource_fqns, disabled):
-        unused = self.get_unused_resource_config_paths(resource_fqns, disabled)
-        if len(unused) == 0:
-            return
-
-        msg = UNUSED_RESOURCE_CONFIGURATION_PATH_MESSAGE.format(
-            len(unused),
-            '\n'.join('- {}'.format('.'.join(u)) for u in unused)
-        )
-        warn_or_error(msg, log_fmt=printer.yellow('{}'))
-
-    def validate_version(self):
-        """Ensure this package works with the installed version of dbt."""
-        installed = get_installed_version()
-        if not versions_compatible(*self.dbt_version):
-            msg = IMPOSSIBLE_VERSION_ERROR.format(
-                package=self.project_name,
-                version_spec=[
-                    x.to_version_string() for x in self.dbt_version
-                ]
+    def get_selector(self, name: str) -> SelectionSpec:
+        if name not in self.selectors:
+            raise RuntimeException(
+                f'Could not find selector named {name}, expected one of '
+                f'{list(self.selectors)}'
             )
-            raise DbtProjectError(msg)
-
-        if not versions_compatible(installed, *self.dbt_version):
-            msg = INVALID_VERSION_ERROR.format(
-                package=self.project_name,
-                installed=installed.to_version_string(),
-                version_spec=[
-                    x.to_version_string() for x in self.dbt_version
-                ]
-            )
-            raise DbtProjectError(msg)
+        return self.selectors[name]

core/dbt/config/renderer.py

@@ -1,111 +1,238 @@
-from dbt import compat
-from dbt.clients.jinja import get_rendered
-from dbt.context.common import generate_config_context
-from dbt.exceptions import DbtProfileError
-from dbt.exceptions import DbtProjectError
-from dbt.exceptions import RecursionException
+from typing import Dict, Any, Tuple, Optional, Union, Callable
+
+from dbt.clients.jinja import get_rendered, catch_jinja
+
+from dbt.exceptions import (
+    DbtProjectError, CompilationException, RecursionException
+)
+from dbt.node_types import NodeType
 from dbt.utils import deep_map
 
 
-class ConfigRenderer(object):
-    """A renderer provides configuration rendering for a given set of cli
-    variables and a render type.
-    """
-    def __init__(self, cli_vars):
-        self.context = generate_config_context(cli_vars)
+Keypath = Tuple[Union[str, int], ...]
 
-    @staticmethod
-    def _is_hook_or_model_vars_path(keypath):
+
+class BaseRenderer:
+    def __init__(self, context: Dict[str, Any]) -> None:
+        self.context = context
+
+    @property
+    def name(self):
+        return 'Rendering'
+
+    def should_render_keypath(self, keypath: Keypath) -> bool:
+        return True
+
+    def render_entry(self, value: Any, keypath: Keypath) -> Any:
+        if not self.should_render_keypath(keypath):
+            return value
+
+        return self.render_value(value, keypath)
+
+    def render_value(
+        self, value: Any, keypath: Optional[Keypath] = None
+    ) -> Any:
+        # keypath is ignored.
+        # if it wasn't read as a string, ignore it
+        if not isinstance(value, str):
+            return value
+        try:
+            with catch_jinja():
+                return get_rendered(value, self.context, native=True)
+        except CompilationException as exc:
+            msg = f'Could not render {value}: {exc.msg}'
+            raise CompilationException(msg) from exc
+
+    def render_data(
+        self, data: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        try:
+            return deep_map(self.render_entry, data)
+        except RecursionException:
+            raise DbtProjectError(
+                f'Cycle detected: {self.name} input has a reference to itself',
+                project=data
+            )
+
+
+def _list_if_none(value):
+    if value is None:
+        value = []
+    return value
+
+
+def _dict_if_none(value):
+    if value is None:
+        value = {}
+    return value
+
+
+def _list_if_none_or_string(value):
+    value = _list_if_none(value)
+    if isinstance(value, str):
+        return [value]
+    return value
+
+
+class ProjectPostprocessor(Dict[Keypath, Callable[[Any], Any]]):
+    def __init__(self):
+        super().__init__()
+
+        self[('on-run-start',)] = _list_if_none_or_string
+        self[('on-run-end',)] = _list_if_none_or_string
+
+        for k in ('models', 'seeds', 'snapshots'):
+            self[(k,)] = _dict_if_none
+            self[(k, 'vars')] = _dict_if_none
+            self[(k, 'pre-hook')] = _list_if_none_or_string
+            self[(k, 'post-hook')] = _list_if_none_or_string
+        self[('seeds', 'column_types')] = _dict_if_none
+
+    def postprocess(self, value: Any, key: Keypath) -> Any:
+        if key in self:
+            handler = self[key]
+            return handler(value)
+
+        return value
+
+
+class DbtProjectYamlRenderer(BaseRenderer):
+    _KEYPATH_HANDLERS = ProjectPostprocessor()
+
+    @property
+    def name(self):
+        'Project config'
+
+    def get_package_renderer(self) -> BaseRenderer:
+        return PackageRenderer(self.context)
+
+    def get_selector_renderer(self) -> BaseRenderer:
+        return SelectorRenderer(self.context)
+
+    def render_project(
+        self,
+        project: Dict[str, Any],
+        project_root: str,
+    ) -> Dict[str, Any]:
+        """Render the project and insert the project root after rendering."""
+        rendered_project = self.render_data(project)
+        rendered_project['project-root'] = project_root
+        return rendered_project
+
+    def render_packages(self, packages: Dict[str, Any]):
+        """Render the given packages dict"""
+        package_renderer = self.get_package_renderer()
+        return package_renderer.render_data(packages)
+
+    def render_selectors(self, selectors: Dict[str, Any]):
+        selector_renderer = self.get_selector_renderer()
+        return selector_renderer.render_data(selectors)
+
+    def render_entry(self, value: Any, keypath: Keypath) -> Any:
+        result = super().render_entry(value, keypath)
+        return self._KEYPATH_HANDLERS.postprocess(result, keypath)
+
+    def should_render_keypath(self, keypath: Keypath) -> bool:
         if not keypath:
-            return False
+            return True
 
         first = keypath[0]
-        # run hooks
-        if first in {'on-run-start', 'on-run-end'}:
-            return True
-        # models have two things to avoid
-        if first in {'seeds', 'models'}:
+        # run hooks are not rendered
+        if first in {'on-run-start', 'on-run-end', 'query-comment'}:
+            return False
+
+        # don't render vars blocks until runtime
+        if first == 'vars':
+            return False
+
+        if first in {'seeds', 'models', 'snapshots', 'seeds'}:
+            keypath_parts = {
+                (k.lstrip('+') if isinstance(k, str) else k)
+                for k in keypath
+            }
             # model-level hooks
-            if 'pre-hook' in keypath or 'post-hook' in keypath:
-                return True
-            # model-level 'vars' declarations
-            if 'vars' in keypath:
-                return True
+            if 'pre-hook' in keypath_parts or 'post-hook' in keypath_parts:
+                return False
+
+        return True
+
+
+class ProfileRenderer(BaseRenderer):
+    @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
 
-    def _render_project_entry(self, value, keypath):
-        """Render an entry, in case it's jinja. This is meant to be passed to
-        deep_map.
+    # don't render descriptions or test keyword arguments
+    def should_render_keypath(self, keypath: Keypath) -> bool:
+        if len(keypath) < 2:
+            return True
 
-        If the parsed entry is a string and has the name 'port', this will
-        attempt to cast it to an int, and on failure will return the parsed
-        string.
+        if keypath[0] not in self.DOCUMENTABLE_NODES:
+            return True
 
-        :param value Any: The value to potentially render
-        :param key str: The key to convert on.
-        :return Any: The rendered entry.
-        """
-        # hooks should be treated as raw sql, they'll get rendered later.
-        # Same goes for 'vars' declarations inside 'models'/'seeds'.
-        if self._is_hook_or_model_vars_path(keypath):
-            return value
+        if len(keypath) < 3:
+            return True
 
-        return self.render_value(value)
+        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
 
-    def render_value(self, value, keypath=None):
-        # keypath is ignored.
-        # if it wasn't read as a string, ignore it
-        if not isinstance(value, compat.basestring):
-            return value
-        # force the result of rendering into this python version's native
-        # string type
-        return compat.to_native_string(get_rendered(value, self.context))
 
-    def _render_profile_data(self, value, keypath):
-        result = self.render_value(value)
-        if len(keypath) == 1 and keypath[-1] == 'port':
-            try:
-                result = int(result)
-            except ValueError:
-                # let the validator or connection handle this
-                pass
-        return result
+class PackageRenderer(BaseRenderer):
+    @property
+    def name(self):
+        return 'Packages config'
 
-    def _render_schema_source_data(self, value, keypath):
-        # things to not render:
-        # - descriptions
-        if len(keypath) > 0 and keypath[-1] == 'description':
-            return value
 
-        return self.render_value(value)
-
-    def render_project(self, as_parsed):
-        """Render the parsed data, returning a new dict (or whatever was read).
-        """
-        try:
-            return deep_map(self._render_project_entry, as_parsed)
-        except RecursionException:
-            raise DbtProjectError(
-                'Cycle detected: Project input has a reference to itself',
-                project=as_parsed
-            )
-
-    def render_profile_data(self, as_parsed):
-        """Render the chosen profile entry, as it was parsed."""
-        try:
-            return deep_map(self._render_profile_data, as_parsed)
-        except RecursionException:
-            raise DbtProfileError(
-                'Cycle detected: Profile input has a reference to itself',
-                project=as_parsed
-            )
-
-    def render_schema_source(self, as_parsed):
-        try:
-            return deep_map(self._render_schema_source_data, as_parsed)
-        except RecursionException:
-            raise DbtProfileError(
-                'Cycle detected: schema.yml input has a reference to itself',
-                project=as_parsed
-            )
+class SelectorRenderer(BaseRenderer):
+    @property
+    def name(self):
+        return 'Selector config'

core/dbt/config/runtime.py

@@ -1,96 +1,86 @@
-
+import itertools
+import os
 from copy import deepcopy
-import pprint
-
-from dbt.utils import parse_cli_vars
-from dbt.contracts.project import Configuration
-from dbt.exceptions import DbtProjectError
-from dbt.exceptions import ValidationException
-from dbt.adapters.factory import get_relation_class_by_name
+from dataclasses import dataclass, fields
+from pathlib import Path
+from typing import (
+    Dict, Any, Optional, Mapping, Iterator, Iterable, Tuple, List, MutableSet,
+    Type
+)
 
 from .profile import Profile
 from .project import Project
+from .renderer import DbtProjectYamlRenderer, ProfileRenderer
+from .utils import parse_cli_vars
+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.ui import warning_tag
+
+from dbt.contracts.project import Configuration, UserConfig
+from dbt.exceptions import (
+    RuntimeException,
+    DbtProfileError,
+    DbtProjectError,
+    validator_error_message,
+    warn_or_error,
+    raise_compiler_error
+)
+
+from hologram import ValidationError
 
 
-_ARCHIVE_REMOVED_MESSAGE = '''
-The `archive` section in `dbt_project.yml` is no longer supported. Please use a
-`snapshot` block instead. For more information on snapshot blocks and a script
-to help migrate these archives, please consult the 0.14.0 migration guide:
-
-https://docs.getdbt.com/v0.14/docs/upgrading-to-014
-'''.strip()
+def _project_quoting_dict(
+    proj: Project, profile: Profile
+) -> Dict[ComponentName, bool]:
+    src: Dict[str, Any] = profile.credentials.translate_aliases(proj.quoting)
+    result: Dict[ComponentName, bool] = {}
+    for key in ComponentName:
+        if key in src:
+            value = src[key]
+            if isinstance(value, bool):
+                result[key] = value
+    return result
 
 
-class RuntimeConfig(Project, Profile):
-    """The runtime configuration, as constructed from its components. There's a
-    lot because there is a lot of stuff!
-    """
-    def __init__(self, project_name, version, project_root, source_paths,
-                 macro_paths, data_paths, test_paths, analysis_paths,
-                 docs_paths, target_path, snapshot_paths, clean_targets,
-                 log_path, modules_path, quoting, models, on_run_start,
-                 on_run_end, archive, seeds, dbt_version, profile_name,
-                 target_name, config, threads, credentials, packages, args):
-        # 'vars'
-        self.args = args
-        self.cli_vars = parse_cli_vars(getattr(args, 'vars', '{}'))
-        # 'project'
-        Project.__init__(
-            self,
-            project_name=project_name,
-            version=version,
-            project_root=project_root,
-            profile_name=profile_name,
-            source_paths=source_paths,
-            macro_paths=macro_paths,
-            data_paths=data_paths,
-            test_paths=test_paths,
-            analysis_paths=analysis_paths,
-            docs_paths=docs_paths,
-            target_path=target_path,
-            snapshot_paths=snapshot_paths,
-            clean_targets=clean_targets,
-            log_path=log_path,
-            modules_path=modules_path,
-            quoting=quoting,
-            models=models,
-            on_run_start=on_run_start,
-            on_run_end=on_run_end,
-            archive=archive,
-            seeds=seeds,
-            dbt_version=dbt_version,
-            packages=packages
-        )
-        # 'profile'
-        Profile.__init__(
-            self,
-            profile_name=profile_name,
-            target_name=target_name,
-            config=config,
-            threads=threads,
-            credentials=credentials
-        )
+@dataclass
+class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
+    args: Any
+    profile_name: str
+    cli_vars: Dict[str, Any]
+    dependencies: Optional[Mapping[str, 'RuntimeConfig']] = None
+
+    def __post_init__(self):
         self.validate()
 
     @classmethod
-    def from_parts(cls, project, profile, args, allow_archive_configs=False):
+    def from_parts(
+        cls,
+        project: Project,
+        profile: Profile,
+        args: Any,
+        dependencies: Optional[Mapping[str, 'RuntimeConfig']] = None,
+    ) -> 'RuntimeConfig':
         """Instantiate a RuntimeConfig from its components.
 
-        :param profile Profile: A parsed dbt Profile.
-        :param project Project: A parsed dbt Project.
-        :param args argparse.Namespace: The parsed command-line arguments.
-        :param allow_archive_configs bool: If True, ignore archive blocks in
-            configs. This flag exists to enable archive migration.
+        :param profile: A parsed dbt Profile.
+        :param project: A parsed dbt Project.
+        :param args: The parsed command-line arguments.
         :returns RuntimeConfig: The new configuration.
         """
-        quoting = deepcopy(
+        quoting: Dict[str, Any] = (
             get_relation_class_by_name(profile.credentials.type)
-            .DEFAULTS['quote_policy']
-        )
-        quoting.update(project.quoting)
-        if project.archive and not allow_archive_configs:
-            # if the user has an `archive` section, raise an error
-            raise DbtProjectError(_ARCHIVE_REMOVED_MESSAGE)
+            .get_default_quote_policy()
+            .replace_dict(_project_quoting_dict(project, profile))
+        ).to_dict()
+
+        cli_vars: Dict[str, Any] = parse_cli_vars(getattr(args, 'vars', '{}'))
 
         return cls(
             project_name=project.project_name,
@@ -102,6 +92,7 @@ class RuntimeConfig(Project, Profile):
             test_paths=project.test_paths,
             analysis_paths=project.analysis_paths,
             docs_paths=project.docs_paths,
+            asset_paths=project.asset_paths,
             target_path=project.target_path,
             snapshot_paths=project.snapshot_paths,
             clean_targets=project.clean_targets,
@@ -111,32 +102,48 @@ class RuntimeConfig(Project, Profile):
             models=project.models,
             on_run_start=project.on_run_start,
             on_run_end=project.on_run_end,
-            archive=project.archive,
             seeds=project.seeds,
+            snapshots=project.snapshots,
             dbt_version=project.dbt_version,
             packages=project.packages,
+            manifest_selectors=project.manifest_selectors,
+            selectors=project.selectors,
+            query_comment=project.query_comment,
+            sources=project.sources,
+            vars=project.vars,
+            config_version=project.config_version,
+            unrendered=project.unrendered,
             profile_name=profile.profile_name,
             target_name=profile.target_name,
             config=profile.config,
             threads=profile.threads,
             credentials=profile.credentials,
-            args=args
+            args=args,
+            cli_vars=cli_vars,
+            dependencies=dependencies,
         )
 
-    def new_project(self, project_root):
+    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.
 
-        :param project_root str: A filepath to a dbt project.
+        :param project_root: A filepath to a dbt project.
         :raises DbtProfileError: If the profile is invalid.
         :raises DbtProjectError: If project is missing or invalid.
-        :returns RuntimeConfig: The new configuration.
+        :returns: The new configuration.
         """
         # copy profile
         profile = Profile(**self.to_profile_info())
         profile.validate()
+
         # load the new project and its packages. Don't pass cli variables.
-        project = Project.from_project_root(project_root, {})
+        renderer = DbtProjectYamlRenderer(generate_target_context(profile, {}))
+
+        project = Project.from_project_root(
+            project_root,
+            renderer,
+            verify_version=getattr(self.args, 'version_check', False),
+        )
 
         cfg = self.from_parts(
             project=project,
@@ -147,7 +154,7 @@ class RuntimeConfig(Project, Profile):
         cfg.quoting = deepcopy(self.quoting)
         return cfg
 
-    def serialize(self):
+    def serialize(self) -> Dict[str, Any]:
         """Serialize the full configuration to a single dictionary. For any
         instance that has passed validate() (which happens in __init__), it
         matches the Configuration contract.
@@ -161,47 +168,398 @@ class RuntimeConfig(Project, Profile):
         result['cli_vars'] = deepcopy(self.cli_vars)
         return result
 
-    def __str__(self):
-        return pprint.pformat(self.serialize())
-
     def validate(self):
         """Validate the configuration against its contract.
 
         :raises DbtProjectError: If the configuration fails validation.
         """
         try:
-            Configuration(**self.serialize())
-        except ValidationException as e:
-            raise DbtProjectError(str(e))
-
-        if getattr(self.args, 'version_check', False):
-            self.validate_version()
+            Configuration.from_dict(self.serialize())
+        except ValidationError as e:
+            raise DbtProjectError(validator_error_message(e)) from e
 
     @classmethod
-    def from_args(cls, args, allow_archive_configs=False):
+    def _get_rendered_profile(
+        cls,
+        args: Any,
+        profile_renderer: ProfileRenderer,
+        profile_name: Optional[str],
+    ) -> Profile:
+        return Profile.render_from_args(
+            args, profile_renderer, profile_name
+        )
+
+    @classmethod
+    def collect_parts(
+        cls: Type['RuntimeConfig'], args: Any
+    ) -> 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)
+        partial = Project.partial_load(
+            project_root,
+            verify_version=version_check
+        )
+
+        # build the profile using the base renderer and the one fact we know
+        cli_vars: Dict[str, Any] = parse_cli_vars(getattr(args, 'vars', '{}'))
+        profile_renderer = ProfileRenderer(generate_base_context(cli_vars))
+        profile_name = partial.render_profile_name(profile_renderer)
+
+        profile = cls._get_rendered_profile(
+            args, profile_renderer, profile_name
+        )
+
+        # get a new renderer using our target information and render the
+        # project
+        ctx = generate_target_context(profile, cli_vars)
+        project_renderer = DbtProjectYamlRenderer(ctx)
+        project = partial.render(project_renderer)
+        return (project, profile)
+
+    @classmethod
+    def from_args(cls, args: Any) -> 'RuntimeConfig':
         """Given arguments, read in dbt_project.yml from the current directory,
         read in packages.yml if it exists, and use them to find the profile to
         load.
 
-        :param args argparse.Namespace: The arguments as parsed from the cli.
-        :param allow_archive_configs bool: If True, ignore archive blocks in
-            configs. This flag exists to enable archive migration.
+        :param args: The arguments as parsed from the cli.
         :raises DbtProjectError: If the project is invalid or missing.
         :raises DbtProfileError: If the profile is invalid or missing.
         :raises ValidationException: If the cli variables are invalid.
         """
-        # build the project and read in packages.yml
-        project = Project.from_args(args)
-
-        # build the profile
-        profile = Profile.from_args(
-            args=args,
-            project_profile_name=project.profile_name
-        )
+        project, profile = cls.collect_parts(args)
 
         return cls.from_parts(
             project=project,
             profile=profile,
             args=args,
-            allow_archive_configs=allow_archive_configs
         )
+
+    def get_metadata(self) -> ManifestMetadata:
+        return ManifestMetadata(
+            project_id=self.hashed_name(),
+            adapter_type=self.credentials.type
+        )
+
+    def _get_v2_config_paths(
+        self,
+        config,
+        path: FQNPath,
+        paths: MutableSet[FQNPath],
+    ) -> PathSet:
+        for key, value in config.items():
+            if isinstance(value, dict) and not key.startswith('+'):
+                self._get_v2_config_paths(value, path + (key,), paths)
+            else:
+                paths.add(path)
+        return frozenset(paths)
+
+    def _get_config_paths(
+        self,
+        config: Dict[str, Any],
+        path: FQNPath = (),
+        paths: Optional[MutableSet[FQNPath]] = None,
+    ) -> PathSet:
+        if paths is None:
+            paths = set()
+
+        for key, value in config.items():
+            if isinstance(value, dict) and not key.startswith('+'):
+                self._get_v2_config_paths(value, path + (key,), paths)
+            else:
+                paths.add(path)
+        return frozenset(paths)
+
+    def get_resource_config_paths(self) -> Dict[str, PathSet]:
+        """Return a dictionary with 'seeds' and 'models' keys whose values are
+        lists of lists of strings, where each inner list of strings represents
+        a configured path in the resource.
+        """
+        return {
+            'models': self._get_config_paths(self.models),
+            'seeds': self._get_config_paths(self.seeds),
+            'snapshots': self._get_config_paths(self.snapshots),
+            'sources': self._get_config_paths(self.sources),
+        }
+
+    def get_unused_resource_config_paths(
+        self,
+        resource_fqns: Mapping[str, PathSet],
+        disabled: PathSet,
+    ) -> List[FQNPath]:
+        """Return a list of lists of strings, where each inner list of strings
+        represents a type + FQN path of a resource configuration that is not
+        used.
+        """
+        disabled_fqns = frozenset(tuple(fqn) for fqn in disabled)
+        resource_config_paths = self.get_resource_config_paths()
+        unused_resource_config_paths = []
+        for resource_type, config_paths in resource_config_paths.items():
+            used_fqns = resource_fqns.get(resource_type, frozenset())
+            fqns = used_fqns | disabled_fqns
+
+            for config_path in config_paths:
+                if not _is_config_used(config_path, fqns):
+                    unused_resource_config_paths.append(
+                        (resource_type,) + config_path
+                    )
+        return unused_resource_config_paths
+
+    def warn_for_unused_resource_config_paths(
+        self,
+        resource_fqns: Mapping[str, PathSet],
+        disabled: PathSet,
+    ) -> None:
+        unused = self.get_unused_resource_config_paths(resource_fqns, disabled)
+        if len(unused) == 0:
+            return
+
+        msg = UNUSED_RESOURCE_CONFIGURATION_PATH_MESSAGE.format(
+            len(unused),
+            '\n'.join('- {}'.format('.'.join(u)) for u in unused)
+        )
+
+        warn_or_error(msg, log_fmt=warning_tag('{}'))
+
+    def load_dependencies(self) -> Mapping[str, 'RuntimeConfig']:
+        if self.dependencies is None:
+            all_projects = {self.project_name: self}
+            internal_packages = get_include_paths(self.credentials.type)
+            project_paths = itertools.chain(
+                internal_packages,
+                self._get_project_directories()
+            )
+            for project_name, project in self.load_projects(project_paths):
+                if project_name in all_projects:
+                    raise_compiler_error(
+                        f'dbt found more than one package with the name '
+                        f'"{project_name}" included in this project. Package '
+                        f'names must be unique in a project. Please rename '
+                        f'one of these packages.'
+                    )
+                all_projects[project_name] = project
+            self.dependencies = all_projects
+        return self.dependencies
+
+    def clear_dependencies(self):
+        self.dependencies = None
+
+    def load_projects(
+        self, paths: Iterable[Path]
+    ) -> Iterator[Tuple[str, 'RuntimeConfig']]:
+        for path in paths:
+            try:
+                project = self.new_project(str(path))
+            except DbtProjectError as e:
+                raise DbtProjectError(
+                    f'Failed to read package: {e}',
+                    result_type='invalid_project',
+                    path=path,
+                ) from e
+            else:
+                yield project.project_name, project
+
+    def _get_project_directories(self) -> Iterator[Path]:
+        root = Path(self.project_root) / self.modules_path
+
+        if root.exists():
+            for path in root.iterdir():
+                if path.is_dir() and not path.name.startswith('__'):
+                    yield path
+
+
+class UnsetCredentials(Credentials):
+    def __init__(self):
+        super().__init__('', '')
+
+    @property
+    def type(self):
+        return None
+
+    def connection_info(self, *args, **kwargs):
+        return {}
+
+    def _connection_keys(self):
+        return ()
+
+
+class UnsetConfig(UserConfig):
+    def __getattribute__(self, name):
+        if name in {f.name for f in fields(UserConfig)}:
+            raise AttributeError(
+                f"'UnsetConfig' object has no attribute {name}"
+            )
+
+    def to_dict(self):
+        return {}
+
+
+class UnsetProfile(Profile):
+    def __init__(self):
+        self.credentials = UnsetCredentials()
+        self.config = UnsetConfig()
+        self.profile_name = ''
+        self.target_name = ''
+        self.threads = -1
+
+    def to_target_dict(self):
+        return {}
+
+    def __getattribute__(self, name):
+        if name in {'profile_name', 'target_name', 'threads'}:
+            raise RuntimeException(
+                f'Error: disallowed attribute "{name}" - no profile!'
+            )
+
+        return Profile.__getattribute__(self, name)
+
+
+@dataclass
+class UnsetProfileConfig(RuntimeConfig):
+    """This class acts a lot _like_ a RuntimeConfig, except if your profile is
+    missing, any access to profile members results in an exception.
+    """
+
+    def __post_init__(self):
+        # instead of futzing with InitVar overrides or rewriting __init__, just
+        # `del` the attrs we don't want  users touching.
+        del self.profile_name
+        del self.target_name
+        # don't call super().__post_init__(), as that calls validate(), and
+        # this object isn't very valid
+
+    def __getattribute__(self, name):
+        # Override __getattribute__ to check that the attribute isn't 'banned'.
+        if name in {'profile_name', 'target_name'}:
+            raise RuntimeException(
+                f'Error: disallowed attribute "{name}" - no profile!'
+            )
+
+        # avoid every attribute access triggering infinite recursion
+        return RuntimeConfig.__getattribute__(self, name)
+
+    def to_target_dict(self):
+        # re-override the poisoned profile behavior
+        return {}
+
+    @classmethod
+    def from_parts(
+        cls,
+        project: Project,
+        profile: Profile,
+        args: Any,
+        dependencies: Optional[Mapping[str, 'RuntimeConfig']] = None,
+    ) -> 'RuntimeConfig':
+        """Instantiate a RuntimeConfig from its components.
+
+        :param profile: Ignored.
+        :param project: A parsed dbt Project.
+        :param args: The parsed command-line arguments.
+        :returns RuntimeConfig: The new configuration.
+        """
+        cli_vars: Dict[str, Any] = parse_cli_vars(getattr(args, 'vars', '{}'))
+
+        return cls(
+            project_name=project.project_name,
+            version=project.version,
+            project_root=project.project_root,
+            source_paths=project.source_paths,
+            macro_paths=project.macro_paths,
+            data_paths=project.data_paths,
+            test_paths=project.test_paths,
+            analysis_paths=project.analysis_paths,
+            docs_paths=project.docs_paths,
+            asset_paths=project.asset_paths,
+            target_path=project.target_path,
+            snapshot_paths=project.snapshot_paths,
+            clean_targets=project.clean_targets,
+            log_path=project.log_path,
+            modules_path=project.modules_path,
+            quoting=project.quoting,  # we never use this anyway.
+            models=project.models,
+            on_run_start=project.on_run_start,
+            on_run_end=project.on_run_end,
+            seeds=project.seeds,
+            snapshots=project.snapshots,
+            dbt_version=project.dbt_version,
+            packages=project.packages,
+            manifest_selectors=project.manifest_selectors,
+            selectors=project.selectors,
+            query_comment=project.query_comment,
+            sources=project.sources,
+            vars=project.vars,
+            config_version=project.config_version,
+            unrendered=project.unrendered,
+            profile_name='',
+            target_name='',
+            config=UnsetConfig(),
+            threads=getattr(args, 'threads', 1),
+            credentials=UnsetCredentials(),
+            args=args,
+            cli_vars=cli_vars,
+            dependencies=dependencies,
+        )
+
+    @classmethod
+    def _get_rendered_profile(
+        cls,
+        args: Any,
+        profile_renderer: ProfileRenderer,
+        profile_name: Optional[str],
+    ) -> Profile:
+        try:
+            profile = Profile.render_from_args(
+                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
+            )
+            # return the poisoned form
+            profile = UnsetProfile()
+            # disable anonymous usage statistics
+            tracking.disable_tracking()
+        return profile
+
+    @classmethod
+    def from_args(cls: Type[RuntimeConfig], args: Any) -> 'RuntimeConfig':
+        """Given arguments, read in dbt_project.yml from the current directory,
+        read in packages.yml if it exists, and use them to find the profile to
+        load.
+
+        :param args: The arguments as parsed from the cli.
+        :raises DbtProjectError: If the project is invalid or missing.
+        :raises DbtProfileError: If the profile is invalid or missing.
+        :raises ValidationException: If the cli variables are invalid.
+        """
+        project, profile = cls.collect_parts(args)
+        if not isinstance(profile, UnsetProfile):
+            # if it's a real profile, return a real config
+            cls = RuntimeConfig
+
+        return cls.from_parts(
+            project=project,
+            profile=profile,
+            args=args
+        )
+
+
+UNUSED_RESOURCE_CONFIGURATION_PATH_MESSAGE = """\
+Configuration paths exist in your dbt_project.yml file which do not \
+apply to any resources.
+There are {} unused configuration paths:
+{}
+"""
+
+
+def _is_config_used(path, fqns):
+    if fqns:
+        for fqn in fqns:
+            if len(path) <= len(fqn) and fqn[:len(path)] == path:
+                return True
+    return False

core/dbt/config/selectors.py

@@ -0,0 +1,180 @@
+from pathlib import Path
+from typing import Dict, Any
+import yaml
+
+from hologram import ValidationError
+
+from .renderer import SelectorRenderer
+
+from dbt.clients.system import (
+    load_file_contents,
+    path_exists,
+    resolve_path_from_base,
+)
+from dbt.clients.yaml_helper import load_yaml_text
+from dbt.contracts.selection import SelectorFile
+from dbt.exceptions import DbtSelectorsError, RuntimeException
+from dbt.graph import parse_from_selectors_definition, SelectionSpec
+from dbt.graph.selector_spec import SelectionCriteria
+
+MALFORMED_SELECTOR_ERROR = """\
+The selectors.yml file in this project is malformed. Please double check
+the contents of this file and fix any errors before retrying.
+
+You can find more information on the syntax for this file here:
+https://docs.getdbt.com/docs/package-management
+
+Validator Error:
+{error}
+"""
+
+
+class SelectorConfig(Dict[str, SelectionSpec]):
+    @classmethod
+    def from_dict(cls, data: Dict[str, Any]) -> 'SelectorConfig':
+        try:
+            selector_file = SelectorFile.from_dict(data)
+            selectors = parse_from_selectors_definition(selector_file)
+        except ValidationError as exc:
+            yaml_sel_cfg = yaml.dump(exc.instance)
+            raise DbtSelectorsError(
+                f"Could not parse selector file data: \n{yaml_sel_cfg}\n"
+                f"Valid root-level selector definitions: "
+                f"union, intersection, string, dictionary. No lists. "
+                f"\nhttps://docs.getdbt.com/reference/node-selection/"
+                f"yaml-selectors",
+                result_type='invalid_selector'
+            ) from exc
+        except RuntimeException as exc:
+            raise DbtSelectorsError(
+                f'Could not read selector file data: {exc}',
+                result_type='invalid_selector',
+            ) from exc
+
+        return cls(selectors)
+
+    @classmethod
+    def render_from_dict(
+        cls,
+        data: Dict[str, Any],
+        renderer: SelectorRenderer,
+    ) -> 'SelectorConfig':
+        try:
+            rendered = renderer.render_data(data)
+        except (ValidationError, RuntimeException) as exc:
+            raise DbtSelectorsError(
+                f'Could not render selector data: {exc}',
+                result_type='invalid_selector',
+            ) from exc
+        return cls.from_dict(rendered)
+
+    @classmethod
+    def from_path(
+        cls, path: Path, renderer: SelectorRenderer,
+    ) -> 'SelectorConfig':
+        try:
+            data = load_yaml_text(load_file_contents(str(path)))
+        except (ValidationError, RuntimeException) as exc:
+            raise DbtSelectorsError(
+                f'Could not read selector file: {exc}',
+                result_type='invalid_selector',
+                path=path,
+            ) from exc
+
+        try:
+            return cls.render_from_dict(data, renderer)
+        except DbtSelectorsError as exc:
+            exc.path = path
+            raise
+
+
+def selector_data_from_root(project_root: str) -> Dict[str, Any]:
+    selector_filepath = resolve_path_from_base(
+        'selectors.yml', project_root
+    )
+
+    if path_exists(selector_filepath):
+        selectors_dict = load_yaml_text(load_file_contents(selector_filepath))
+    else:
+        selectors_dict = None
+    return selectors_dict
+
+
+def selector_config_from_data(
+    selectors_data: Dict[str, Any]
+) -> SelectorConfig:
+    if not selectors_data:
+        selectors_data = {'selectors': []}
+
+    try:
+        selectors = SelectorConfig.from_dict(selectors_data)
+    except ValidationError as e:
+        raise DbtSelectorsError(
+            MALFORMED_SELECTOR_ERROR.format(error=str(e.message)),
+            result_type='invalid_selector',
+        ) from e
+    return selectors
+
+
+# These are utilities to clean up the dictionary created from
+# selectors.yml by turning the cli-string format entries into
+# normalized dictionary entries. It parallels the flow in
+# dbt/graph/cli.py. If changes are made there, it might
+# be necessary to make changes here. Ideally it would be
+# good to combine the two flows into one at some point.
+class SelectorDict:
+
+    @classmethod
+    def parse_dict_definition(cls, definition):
+        key = list(definition)[0]
+        value = definition[key]
+        if isinstance(value, list):
+            new_values = []
+            for sel_def in value:
+                new_value = cls.parse_from_definition(sel_def)
+                new_values.append(new_value)
+            value = new_values
+        if key == 'exclude':
+            definition = {key: value}
+        elif len(definition) == 1:
+            definition = {'method': key, 'value': value}
+        return definition
+
+    @classmethod
+    def parse_a_definition(cls, def_type, definition):
+        # this definition must be a list
+        new_dict = {def_type: []}
+        for sel_def in definition[def_type]:
+            if isinstance(sel_def, dict):
+                sel_def = cls.parse_from_definition(sel_def)
+                new_dict[def_type].append(sel_def)
+            elif isinstance(sel_def, str):
+                sel_def = SelectionCriteria.dict_from_single_spec(sel_def)
+                new_dict[def_type].append(sel_def)
+            else:
+                new_dict[def_type].append(sel_def)
+        return new_dict
+
+    @classmethod
+    def parse_from_definition(cls, definition):
+        if isinstance(definition, str):
+            definition = SelectionCriteria.dict_from_single_spec(definition)
+        elif 'union' in definition:
+            definition = cls.parse_a_definition('union', definition)
+        elif 'intersection' in definition:
+            definition = cls.parse_a_definition('intersection', definition)
+        elif isinstance(definition, dict):
+            definition = cls.parse_dict_definition(definition)
+        return definition
+
+    # This is the normal entrypoint of this code. Give it the
+    # list of selectors generated from the selectors.yml file.
+    @classmethod
+    def parse_from_selectors_list(cls, selectors):
+        selector_dict = {}
+        for selector in selectors:
+            sel_name = selector['name']
+            selector_dict[sel_name] = selector
+            definition = cls.parse_from_definition(selector['definition'])
+            selector_dict[sel_name]['definition'] = definition
+        return selector_dict

core/dbt/config/utils.py

@@ -0,0 +1,23 @@
+from typing import Dict, Any
+
+from dbt.clients import yaml_helper
+from dbt.exceptions import raise_compiler_error, ValidationException
+from dbt.logger import GLOBAL_LOGGER as logger
+
+
+def parse_cli_vars(var_string: str) -> Dict[str, Any]:
+    try:
+        cli_vars = yaml_helper.load_yaml_text(var_string)
+        var_type = type(cli_vars)
+        if var_type is dict:
+            return cli_vars
+        else:
+            type_name = var_type.__name__
+            raise_compiler_error(
+                "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"
+        )
+        raise

core/dbt/context/base.py

@@ -0,0 +1,539 @@
+import json
+import os
+from typing import (
+    Any, Dict, NoReturn, Optional, Mapping
+)
+
+from dbt import flags
+from dbt import tracking
+from dbt.clients.jinja import undefined_error, get_rendered
+from dbt.clients import yaml_helper
+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.version import __version__ as dbt_version
+
+import yaml
+# These modules are added to the context. Consider alternative
+# approaches which will extend well to potentially many modules
+import pytz
+import datetime
+import re
+
+
+def get_pytz_module_context() -> Dict[str, Any]:
+    context_exports = pytz.__all__  # type: ignore
+
+    return {
+        name: getattr(pytz, name) for name in context_exports
+    }
+
+
+def get_datetime_module_context() -> Dict[str, Any]:
+    context_exports = [
+        'date',
+        'datetime',
+        'time',
+        'timedelta',
+        'tzinfo'
+    ]
+
+    return {
+        name: getattr(datetime, name) for name in context_exports
+    }
+
+
+def get_re_module_context() -> Dict[str, Any]:
+    context_exports = re.__all__
+
+    return {
+        name: getattr(re, name) for name in context_exports
+    }
+
+
+def get_context_modules() -> Dict[str, Dict[str, Any]]:
+    return {
+        'pytz': get_pytz_module_context(),
+        'datetime': get_datetime_module_context(),
+        're': get_re_module_context(),
+    }
+
+
+class ContextMember:
+    def __init__(self, value, name=None):
+        self.name = name
+        self.inner = value
+
+    def key(self, default):
+        if self.name is None:
+            return default
+        return self.name
+
+
+def contextmember(value):
+    if isinstance(value, str):
+        return lambda v: ContextMember(v, name=value)
+    return ContextMember(value)
+
+
+def contextproperty(value):
+    if isinstance(value, str):
+        return lambda v: ContextMember(property(v), name=value)
+    return ContextMember(property(value))
+
+
+class ContextMeta(type):
+    def __new__(mcls, name, bases, dct):
+        context_members = {}
+        context_attrs = {}
+        new_dct = {}
+
+        for base in bases:
+            context_members.update(getattr(base, '_context_members_', {}))
+            context_attrs.update(getattr(base, '_context_attrs_', {}))
+
+        for key, value in dct.items():
+            if isinstance(value, ContextMember):
+                context_key = value.key(key)
+                context_members[context_key] = value.inner
+                context_attrs[context_key] = key
+                value = value.inner
+            new_dct[key] = value
+        new_dct['_context_members_'] = context_members
+        new_dct['_context_attrs_'] = context_attrs
+        return type.__new__(mcls, name, bases, new_dct)
+
+
+class Var:
+    UndefinedVarError = "Required var '{}' not found in config:\nVars "\
+                        "supplied to {} = {}"
+    _VAR_NOTSET = object()
+
+    def __init__(
+        self,
+        context: Mapping[str, Any],
+        cli_vars: Mapping[str, Any],
+        node: Optional[CompiledResource] = None
+    ) -> None:
+        self._context: Mapping[str, Any] = context
+        self._cli_vars: Mapping[str, Any] = cli_vars
+        self._node: Optional[CompiledResource] = node
+        self._merged: Mapping[str, Any] = self._generate_merged()
+
+    def _generate_merged(self) -> Mapping[str, Any]:
+        return self._cli_vars
+
+    @property
+    def node_name(self):
+        if self._node is not None:
+            return self._node.name
+        else:
+            return '<Configuration>'
+
+    def get_missing_var(self, var_name):
+        dct = {k: self._merged[k] for k in self._merged}
+        pretty_vars = json.dumps(dct, sort_keys=True, indent=4)
+        msg = self.UndefinedVarError.format(
+            var_name, self.node_name, pretty_vars
+        )
+        raise_compiler_error(msg, self._node)
+
+    def has_var(self, var_name: str):
+        return var_name in self._merged
+
+    def get_rendered_var(self, var_name):
+        raw = self._merged[var_name]
+        # if bool/int/float/etc are passed in, don't compile anything
+        if not isinstance(raw, str):
+            return raw
+
+        return get_rendered(raw, self._context)
+
+    def __call__(self, var_name, default=_VAR_NOTSET):
+        if self.has_var(var_name):
+            return self.get_rendered_var(var_name)
+        elif default is not self._VAR_NOTSET:
+            return default
+        else:
+            return self.get_missing_var(var_name)
+
+
+class BaseContext(metaclass=ContextMeta):
+    def __init__(self, cli_vars):
+        self._ctx = {}
+        self.cli_vars = cli_vars
+
+    def generate_builtins(self):
+        builtins: Dict[str, Any] = {}
+        for key, value in self._context_members_.items():
+            if hasattr(value, '__get__'):
+                # handle properties, bound methods, etc
+                value = value.__get__(self)
+            builtins[key] = value
+        return builtins
+
+    def to_dict(self):
+        self._ctx['context'] = self._ctx
+        builtins = self.generate_builtins()
+        self._ctx['builtins'] = builtins
+        self._ctx.update(builtins)
+        return self._ctx
+
+    @contextproperty
+    def dbt_version(self) -> str:
+        """The `dbt_version` variable returns the installed version of dbt that
+        is currently running. It can be used for debugging or auditing
+        purposes.
+
+        > macros/get_version.sql
+
+            {% macro get_version() %}
+              {% set msg = "The installed version of dbt is: " ~ dbt_version %}
+              {% do log(msg, info=true) %}
+            {% endmacro %}
+
+        Example output:
+
+            $ dbt run-operation get_version
+            The installed version of dbt is 0.16.0
+        """
+        return dbt_version
+
+    @contextproperty
+    def var(self) -> Var:
+        """Variables can be passed from your `dbt_project.yml` file into models
+        during compilation. These variables are useful for configuring packages
+        for deployment in multiple environments, or defining values that should
+        be used across multiple models within a package.
+
+        To add a variable to a model, use the `var()` function:
+
+        > my_model.sql:
+
+            select * from events where event_type = '{{ var("event_type") }}'
+
+        If you try to run this model without supplying an `event_type`
+        variable, you'll receive a compilation error that looks like this:
+
+            Encountered an error:
+            ! Compilation error while compiling model package_name.my_model:
+            ! Required var 'event_type' not found in config:
+            Vars supplied to package_name.my_model = {
+            }
+
+        To supply a variable to a given model, add one or more `vars`
+        dictionaries to the `models` config in your `dbt_project.yml` file.
+        These `vars` are in-scope for all models at or below where they are
+        defined, so place them where they make the most sense. Below are three
+        different placements of the `vars` dict, all of which will make the
+        `my_model` model compile.
+
+        > dbt_project.yml:
+
+            # 1) scoped at the model level
+            models:
+              package_name:
+                my_model:
+                  materialized: view
+                  vars:
+                    event_type: activation
+            # 2) scoped at the package level
+            models:
+              package_name:
+                vars:
+                  event_type: activation
+                my_model:
+                  materialized: view
+            # 3) scoped globally
+            models:
+              vars:
+                event_type: activation
+              package_name:
+                my_model:
+                  materialized: view
+
+        ## Variable default values
+
+        The `var()` function takes an optional second argument, `default`. If
+        this argument is provided, then it will be the default value for the
+        variable if one is not explicitly defined.
+
+        > my_model.sql:
+
+            -- Use 'activation' as the event_type if the variable is not
+            -- defined.
+            select *
+            from events
+            where event_type = '{{ var("event_type", "activation") }}'
+        """
+        return Var(self._ctx, self.cli_vars)
+
+    @contextmember
+    @staticmethod
+    def env_var(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.
+        """
+        if var in os.environ:
+            return os.environ[var]
+        elif default is not None:
+            return default
+        else:
+            msg = f"Env var required but not provided: '{var}'"
+            undefined_error(msg)
+
+    if os.environ.get('DBT_MACRO_DEBUGGING'):
+        @contextmember
+        @staticmethod
+        def debug():
+            """Enter a debugger at this line in the compiled jinja code."""
+            import sys
+            import ipdb  # type: ignore
+            frame = sys._getframe(3)
+            ipdb.set_trace(frame)
+            return ''
+
+    @contextmember('return')
+    @staticmethod
+    def _return(data: Any) -> NoReturn:
+        """The `return` function can be used in macros to return data to the
+        caller. The type of the data (`dict`, `list`, `int`, etc) will be
+        preserved through the return call.
+
+        :param data: The data to return to the caller
+
+
+        > macros/example.sql:
+
+            {% macro get_data() %}
+              {{ return([1,2,3]) }}
+            {% endmacro %}
+
+        > models/my_model.sql:
+
+            select
+              -- getdata() returns a list!
+              {% for i in getdata() %}
+                {{ i }}
+                {% if not loop.last %},{% endif %}
+              {% endfor %}
+
+        """
+        raise MacroReturn(data)
+
+    @contextmember
+    @staticmethod
+    def fromjson(string: str, default: Any = None) -> Any:
+        """The `fromjson` context method can be used to deserialize a json
+        string into a Python object primitive, eg. a `dict` or `list`.
+
+        :param value: The json string to deserialize
+        :param default: A default value to return if the `string` argument
+            cannot be deserialized (optional)
+
+        Usage:
+
+            {% set my_json_str = '{"abc": 123}' %}
+            {% set my_dict = fromjson(my_json_str) %}
+            {% do log(my_dict['abc']) %}
+        """
+        try:
+            return json.loads(string)
+        except ValueError:
+            return default
+
+    @contextmember
+    @staticmethod
+    def tojson(
+        value: Any, default: Any = None, sort_keys: bool = False
+    ) -> Any:
+        """The `tojson` context method can be used to serialize a Python
+        object primitive, eg. a `dict` or `list` to a json string.
+
+        :param value: The value serialize to json
+        :param default: A default value to return if the `value` argument
+            cannot be serialized
+        :param sort_keys: If True, sort the keys.
+
+
+        Usage:
+
+            {% set my_dict = {"abc": 123} %}
+            {% set my_json_string = tojson(my_dict) %}
+            {% do log(my_json_string) %}
+        """
+        try:
+            return json.dumps(value, sort_keys=sort_keys)
+        except ValueError:
+            return default
+
+    @contextmember
+    @staticmethod
+    def fromyaml(value: str, default: Any = None) -> Any:
+        """The fromyaml context method can be used to deserialize a yaml string
+        into a Python object primitive, eg. a `dict` or `list`.
+
+        :param value: The yaml string to deserialize
+        :param default: A default value to return if the `string` argument
+            cannot be deserialized (optional)
+
+        Usage:
+
+            {% set my_yml_str -%}
+            dogs:
+             - good
+             - bad
+            {%- endset %}
+            {% set my_dict = fromyaml(my_yml_str) %}
+            {% do log(my_dict['dogs'], info=true) %}
+            -- ["good", "bad"]
+            {% do my_dict['dogs'].pop() }
+            {% do log(my_dict['dogs'], info=true) %}
+            -- ["good"]
+        """
+        try:
+            return yaml_helper.safe_load(value)
+        except (AttributeError, ValueError, yaml.YAMLError):
+            return default
+
+    # safe_dump defaults to sort_keys=True, but we act like json.dumps (the
+    # opposite)
+    @contextmember
+    @staticmethod
+    def toyaml(
+        value: Any, default: Optional[str] = None, sort_keys: bool = False
+    ) -> Optional[str]:
+        """The `tojson` context method can be used to serialize a Python
+        object primitive, eg. a `dict` or `list` to a yaml string.
+
+        :param value: The value serialize to yaml
+        :param default: A default value to return if the `value` argument
+            cannot be serialized
+        :param sort_keys: If True, sort the keys.
+
+
+        Usage:
+
+            {% set my_dict = {"abc": 123} %}
+            {% set my_yaml_string = toyaml(my_dict) %}
+            {% do log(my_yaml_string) %}
+        """
+        try:
+            return yaml.safe_dump(data=value, sort_keys=sort_keys)
+        except (ValueError, yaml.YAMLError):
+            return default
+
+    @contextmember
+    @staticmethod
+    def log(msg: str, info: bool = False) -> str:
+        """Logs a line to either the log file or stdout.
+
+        :param msg: The message to log
+        :param info: If `False`, write to the log file. If `True`, write to
+            both the log file and stdout.
+
+        > macros/my_log_macro.sql
+
+            {% macro some_macro(arg1, arg2) %}
+              {{ log("Running some_macro: " ~ arg1 ~ ", " ~ arg2) }}
+            {% endmacro %}"
+        """
+        if info:
+            logger.info(msg)
+        else:
+            logger.debug(msg)
+        return ''
+
+    @contextproperty
+    def run_started_at(self) -> Optional[datetime.datetime]:
+        """`run_started_at` outputs the timestamp that this run started, e.g.
+        `2017-04-21 01:23:45.678`. The `run_started_at` variable is a Python
+        `datetime` object. As of 0.9.1, the timezone of this variable defaults
+        to UTC.
+
+        > run_started_at_example.sql
+
+            select
+                '{{ run_started_at.strftime("%Y-%m-%d") }}' as date_day
+            from ...
+
+
+        To modify the timezone of this variable, use the the `pytz` module:
+
+        > run_started_at_utc.sql
+
+            {% set est = modules.pytz.timezone("America/New_York") %}
+            select
+                '{{ run_started_at.astimezone(est) }}' as run_started_est
+            from ...
+        """
+        if tracking.active_user is not None:
+            return tracking.active_user.run_started_at
+        else:
+            return None
+
+    @contextproperty
+    def invocation_id(self) -> Optional[str]:
+        """invocation_id outputs a UUID generated for this dbt run (useful for
+        auditing)
+        """
+        if tracking.active_user is not None:
+            return tracking.active_user.invocation_id
+        else:
+            return None
+
+    @contextproperty
+    def modules(self) -> Dict[str, Any]:
+        """The `modules` variable in the Jinja context contains useful Python
+        modules for operating on data.
+
+        # datetime
+
+        This variable is a pointer to the Python datetime module.
+
+        Usage:
+
+            {% set dt = modules.datetime.datetime.now() %}
+
+        # pytz
+
+        This variable is a pointer to the Python pytz module.
+
+        Usage:
+
+            {% set dt = modules.datetime.datetime(2002, 10, 27, 6, 0, 0) %}
+            {% set dt_local = modules.pytz.timezone('US/Eastern').localize(dt) %}
+            {{ dt_local }}
+        """  # noqa
+        return get_context_modules()
+
+    @contextproperty
+    def flags(self) -> Any:
+        """The `flags` variable contains true/false values for flags provided
+        on the command line.
+
+        > flags.sql:
+
+            {% if flags.FULL_REFRESH %}
+            drop table ...
+            {% else %}
+            -- 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
+        """
+        return flags
+
+
+def generate_base_context(cli_vars: Dict[str, Any]) -> Dict[str, Any]:
+    ctx = BaseContext(cli_vars)
+    return ctx.to_dict()

core/dbt/context/common.py

@@ -1,488 +0,0 @@
-import json
-import os
-
-from dbt.adapters.factory import get_adapter
-from dbt.compat import basestring
-from dbt.node_types import NodeType
-from dbt.contracts.graph.parsed import ParsedMacro, ParsedNode
-from dbt.include.global_project import PACKAGES
-from dbt.include.global_project import PROJECT_NAME as GLOBAL_PROJECT_NAME
-
-import dbt.clients.jinja
-import dbt.clients.agate_helper
-import dbt.flags
-import dbt.tracking
-import dbt.writer
-import dbt.utils
-
-from dbt.logger import GLOBAL_LOGGER as logger  # noqa
-
-
-# These modules are added to the context. Consider alternative
-# approaches which will extend well to potentially many modules
-import pytz
-import datetime
-
-
-class RelationProxy(object):
-    def __init__(self, adapter):
-        self.quoting_config = adapter.config.quoting
-        self.relation_type = adapter.Relation
-
-    def __getattr__(self, key):
-        return getattr(self.relation_type, key)
-
-    def create_from_source(self, *args, **kwargs):
-        # bypass our create when creating from source so as not to mess up
-        # the source quoting
-        return self.relation_type.create_from_source(*args, **kwargs)
-
-    def create(self, *args, **kwargs):
-        kwargs['quote_policy'] = dbt.utils.merge(
-            self.quoting_config,
-            kwargs.pop('quote_policy', {})
-        )
-        return self.relation_type.create(*args, **kwargs)
-
-
-class BaseDatabaseWrapper(object):
-    """
-    Wrapper for runtime database interaction. Applies the runtime quote policy
-    via a relation proxy.
-    """
-    def __init__(self, adapter):
-        self.adapter = adapter
-        self.Relation = RelationProxy(adapter)
-
-    def __getattr__(self, name):
-        raise NotImplementedError('subclasses need to implement this')
-
-    @property
-    def config(self):
-        return self.adapter.config
-
-    def type(self):
-        return self.adapter.type()
-
-    def commit(self):
-        return self.adapter.commit_if_has_connection()
-
-
-class BaseResolver(object):
-    def __init__(self, db_wrapper, model, config, manifest):
-        self.db_wrapper = db_wrapper
-        self.model = model
-        self.config = config
-        self.manifest = manifest
-
-    @property
-    def current_project(self):
-        return self.config.project_name
-
-    @property
-    def Relation(self):
-        return self.db_wrapper.Relation
-
-
-def _add_macro_map(context, package_name, macro_map):
-    """Update an existing context in-place, adding the given macro map to the
-    appropriate package namespace. Adapter packages get inserted into the
-    global namespace.
-    """
-    key = package_name
-    if package_name in PACKAGES:
-        key = GLOBAL_PROJECT_NAME
-    if key not in context:
-        context[key] = {}
-
-    context[key].update(macro_map)
-
-
-def _add_macros(context, model, manifest):
-    macros_to_add = {'global': [], 'local': []}
-
-    for unique_id, macro in manifest.macros.items():
-        if macro.resource_type != NodeType.Macro:
-            continue
-        package_name = macro.package_name
-
-        macro_map = {
-            macro.name: macro.generator(context)
-        }
-
-        # adapter packages are part of the global project space
-        _add_macro_map(context, package_name, macro_map)
-
-        if package_name == model.package_name:
-            macros_to_add['local'].append(macro_map)
-        elif package_name in PACKAGES:
-            macros_to_add['global'].append(macro_map)
-
-    # Load global macros before local macros -- local takes precedence
-    unprefixed_macros = macros_to_add['global'] + macros_to_add['local']
-    for macro_map in unprefixed_macros:
-        context.update(macro_map)
-
-    return context
-
-
-def _add_tracking(context):
-    if dbt.tracking.active_user is not None:
-        context = dbt.utils.merge(context, {
-            "run_started_at": dbt.tracking.active_user.run_started_at,
-            "invocation_id": dbt.tracking.active_user.invocation_id,
-        })
-    else:
-        context = dbt.utils.merge(context, {
-            "run_started_at": None,
-            "invocation_id": None
-        })
-
-    return context
-
-
-def _add_validation(context):
-    def validate_any(*args):
-        def inner(value):
-            for arg in args:
-                if isinstance(arg, type) and isinstance(value, arg):
-                    return
-                elif value == arg:
-                    return
-            raise dbt.exceptions.ValidationException(
-                'Expected value "{}" to be one of {}'
-                .format(value, ','.join(map(str, args))))
-        return inner
-
-    validation_utils = dbt.utils.AttrDict({
-        'any': validate_any,
-    })
-
-    return dbt.utils.merge(
-        context,
-        {'validation': validation_utils})
-
-
-def env_var(var, default=None):
-    if var in os.environ:
-        return os.environ[var]
-    elif default is not None:
-        return default
-    else:
-        msg = "Env var required but not provided: '{}'".format(var)
-        dbt.clients.jinja.undefined_error(msg)
-
-
-def _store_result(sql_results):
-    def call(name, status, agate_table=None):
-        if agate_table is None:
-            agate_table = dbt.clients.agate_helper.empty_table()
-
-        sql_results[name] = dbt.utils.AttrDict({
-            'status': status,
-            'data': dbt.clients.agate_helper.as_matrix(agate_table),
-            'table': agate_table
-        })
-        return ''
-
-    return call
-
-
-def _load_result(sql_results):
-    def call(name):
-        return sql_results.get(name)
-
-    return call
-
-
-def _add_sql_handlers(context):
-    sql_results = {}
-    return dbt.utils.merge(context, {
-        '_sql_results': sql_results,
-        'store_result': _store_result(sql_results),
-        'load_result': _load_result(sql_results),
-    })
-
-
-def log(msg, info=False):
-    if info:
-        logger.info(msg)
-    else:
-        logger.debug(msg)
-    return ''
-
-
-class Var(object):
-    UndefinedVarError = "Required var '{}' not found in config:\nVars "\
-                        "supplied to {} = {}"
-    _VAR_NOTSET = object()
-
-    def __init__(self, model, context, overrides):
-        self.model = model
-        self.context = context
-
-        # These are hard-overrides (eg. CLI vars) that should take
-        # precedence over context-based var definitions
-        self.overrides = overrides
-
-        if isinstance(model, dict) and model.get('unique_id'):
-            local_vars = model.get('config', {}).get('vars', {})
-            self.model_name = model.get('name')
-        elif isinstance(model, ParsedMacro):
-            local_vars = {}  # macros have no config
-            self.model_name = model.name
-        elif isinstance(model, ParsedNode):
-            local_vars = model.config.get('vars', {})
-            self.model_name = model.name
-        elif model is None:
-            # during config parsing we have no model and no local vars
-            self.model_name = '<Configuration>'
-            local_vars = {}
-        else:
-            # still used for wrapping
-            self.model_name = model.nice_name
-            local_vars = model.config.get('vars', {})
-
-        self.local_vars = dbt.utils.merge(local_vars, overrides)
-
-    def pretty_dict(self, data):
-        return json.dumps(data, sort_keys=True, indent=4)
-
-    def get_missing_var(self, var_name):
-        pretty_vars = self.pretty_dict(self.local_vars)
-        msg = self.UndefinedVarError.format(
-            var_name, self.model_name, pretty_vars
-        )
-        dbt.exceptions.raise_compiler_error(msg, self.model)
-
-    def assert_var_defined(self, var_name, default):
-        if var_name not in self.local_vars and default is self._VAR_NOTSET:
-            return self.get_missing_var(var_name)
-
-    def get_rendered_var(self, var_name):
-        raw = self.local_vars[var_name]
-        # if bool/int/float/etc are passed in, don't compile anything
-        if not isinstance(raw, basestring):
-            return raw
-
-        return dbt.clients.jinja.get_rendered(raw, self.context)
-
-    def __call__(self, var_name, default=_VAR_NOTSET):
-        if var_name in self.local_vars:
-            return self.get_rendered_var(var_name)
-        elif default is not self._VAR_NOTSET:
-            return default
-        else:
-            return self.get_missing_var(var_name)
-
-
-def write(node, target_path, subdirectory):
-    def fn(payload):
-        node['build_path'] = dbt.writer.write_node(
-            node, target_path, subdirectory, payload)
-        return ''
-
-    return fn
-
-
-def render(context, node):
-    def fn(string):
-        return dbt.clients.jinja.get_rendered(string, context, node)
-
-    return fn
-
-
-def fromjson(string, default=None):
-    try:
-        return json.loads(string)
-    except ValueError:
-        return default
-
-
-def tojson(value, default=None):
-    try:
-        return json.dumps(value)
-    except ValueError:
-        return default
-
-
-def try_or_compiler_error(model):
-    def impl(message_if_exception, func, *args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-        except Exception:
-            dbt.exceptions.raise_compiler_error(message_if_exception, model)
-    return impl
-
-
-def _return(value):
-    raise dbt.exceptions.MacroReturn(value)
-
-
-def get_this_relation(db_wrapper, config, model):
-    return db_wrapper.Relation.create_from_node(config, model)
-
-
-def get_pytz_module_context():
-    context_exports = pytz.__all__
-
-    return {
-        name: getattr(pytz, name) for name in context_exports
-    }
-
-
-def get_datetime_module_context():
-    context_exports = [
-        'date',
-        'datetime',
-        'time',
-        'timedelta',
-        'tzinfo'
-    ]
-
-    return {
-        name: getattr(datetime, name) for name in context_exports
-    }
-
-
-def get_context_modules():
-    return {
-        'pytz': get_pytz_module_context(),
-        'datetime': get_datetime_module_context(),
-    }
-
-
-def generate_config_context(cli_vars):
-    context = {
-        'env_var': env_var,
-        'modules': get_context_modules(),
-    }
-    context['var'] = Var(None, context, cli_vars)
-    return _add_tracking(context)
-
-
-def generate_base(model, model_dict, config, manifest, source_config,
-                  provider, adapter=None):
-    """Generate the common aspects of the config dict."""
-    if provider is None:
-        raise dbt.exceptions.InternalException(
-            "Invalid provider given to context: {}".format(provider))
-
-    target_name = config.target_name
-    target = config.to_profile_info()
-    del target['credentials']
-    target.update(config.credentials.serialize(with_aliases=True))
-    target['type'] = config.credentials.type
-    target.pop('pass', None)
-    target['name'] = target_name
-
-    adapter = get_adapter(config)
-
-    context = {'env': target}
-
-    pre_hooks = None
-    post_hooks = None
-
-    db_wrapper = provider.DatabaseWrapper(adapter)
-
-    context = dbt.utils.merge(context, {
-        "adapter": db_wrapper,
-        "api": {
-            "Relation": db_wrapper.Relation,
-            "Column": adapter.Column,
-        },
-        "column": adapter.Column,
-        "config": provider.Config(model_dict, source_config),
-        "database": config.credentials.database,
-        "env_var": env_var,
-        "exceptions": dbt.exceptions.wrapped_exports(model),
-        "execute": provider.execute,
-        "flags": dbt.flags,
-        # TODO: Do we have to leave this in?
-        "graph": manifest.to_flat_graph(),
-        "log": log,
-        "model": model_dict,
-        "modules": get_context_modules(),
-        "post_hooks": post_hooks,
-        "pre_hooks": pre_hooks,
-        "ref": provider.ref(db_wrapper, model, config, manifest),
-        "return": _return,
-        "schema": config.credentials.schema,
-        "sql": None,
-        "sql_now": adapter.date_function(),
-        "source": provider.source(db_wrapper, model, config, manifest),
-        "fromjson": fromjson,
-        "tojson": tojson,
-        "target": target,
-        "try_or_compiler_error": try_or_compiler_error(model)
-    })
-
-    return context
-
-
-def modify_generated_context(context, model, model_dict, config, manifest,
-                             provider):
-    cli_var_overrides = config.cli_vars
-
-    context = _add_tracking(context)
-    context = _add_validation(context)
-    context = _add_sql_handlers(context)
-
-    # we make a copy of the context for each of these ^^
-
-    context = _add_macros(context, model, manifest)
-
-    context["write"] = write(model_dict, config.target_path, 'run')
-    context["render"] = render(context, model_dict)
-    context["var"] = provider.Var(model, context=context,
-                                  overrides=cli_var_overrides)
-    context['context'] = context
-
-    return context
-
-
-def generate_execute_macro(model, config, manifest, provider):
-    """Internally, macros can be executed like nodes, with some restrictions:
-
-     - they don't have have all values available that nodes do:
-        - 'this', 'pre_hooks', 'post_hooks', and 'sql' are missing
-        - 'schema' does not use any 'model' information
-     - they can't be configured with config() directives
-    """
-    model_dict = model.serialize()
-    context = generate_base(model, model_dict, config, manifest, None,
-                            provider)
-
-    return modify_generated_context(context, model, model_dict, config,
-                                    manifest, provider)
-
-
-def generate_model(model, config, manifest, source_config, provider):
-    model_dict = model.to_dict()
-    context = generate_base(model, model_dict, config, manifest,
-                            source_config, provider)
-    # operations (hooks) don't get a 'this'
-    if model.resource_type != NodeType.Operation:
-        this = get_this_relation(context['adapter'], config, model_dict)
-        context['this'] = this
-    # overwrite schema/database if we have them, and hooks + sql
-    context.update({
-        'schema': model.get('schema', context['schema']),
-        'database': model.get('database', context['database']),
-        'pre_hooks': model.config.get('pre-hook'),
-        'post_hooks': model.config.get('post-hook'),
-        'sql': model.get('injected_sql'),
-    })
-
-    return modify_generated_context(context, model, model_dict, config,
-                                    manifest, provider)
-
-
-def generate(model, config, manifest, source_config=None, provider=None):
-    """
-    Not meant to be called directly. Call with either:
-        dbt.context.parser.generate
-    or
-        dbt.context.runtime.generate
-    """
-    return generate_model(model, config, manifest, source_config, provider)

core/dbt/context/configured.py

@@ -0,0 +1,82 @@
+from typing import Any, Dict
+
+from dbt.contracts.connection import AdapterRequiredConfig
+from dbt.node_types import NodeType
+from dbt.utils import MultiDict
+
+from dbt.context.base import contextproperty, Var
+from dbt.context.target import TargetContext
+
+
+class ConfiguredContext(TargetContext):
+    config: AdapterRequiredConfig
+
+    def __init__(
+        self, config: AdapterRequiredConfig
+    ) -> None:
+        super().__init__(config, config.cli_vars)
+
+    @contextproperty
+    def project_name(self) -> str:
+        return self.config.project_name
+
+
+class FQNLookup:
+    def __init__(self, package_name: str):
+        self.package_name = package_name
+        self.fqn = [package_name]
+        self.resource_type = NodeType.Model
+
+
+class ConfiguredVar(Var):
+    def __init__(
+        self,
+        context: Dict[str, Any],
+        config: AdapterRequiredConfig,
+        project_name: str,
+    ):
+        super().__init__(context, config.cli_vars)
+        self._config = config
+        self._project_name = project_name
+
+    def __call__(self, var_name, default=Var._VAR_NOTSET):
+        my_config = self._config.load_dependencies()[self._project_name]
+
+        # cli vars > active project > local project
+        if var_name in self._config.cli_vars:
+            return self._config.cli_vars[var_name]
+
+        adapter_type = self._config.credentials.type
+        lookup = FQNLookup(self._project_name)
+        active_vars = self._config.vars.vars_for(lookup, adapter_type)
+        all_vars = MultiDict([active_vars])
+
+        if self._config.project_name != my_config.project_name:
+            all_vars.add(my_config.vars.vars_for(lookup, adapter_type))
+
+        if var_name in all_vars:
+            return all_vars[var_name]
+
+        if default is not Var._VAR_NOTSET:
+            return default
+
+        return self.get_missing_var(var_name)
+
+
+class SchemaYamlContext(ConfiguredContext):
+    def __init__(self, config, project_name: str):
+        super().__init__(config)
+        self._project_name = project_name
+
+    @contextproperty
+    def var(self) -> ConfiguredVar:
+        return ConfiguredVar(
+            self._ctx, self.config, self._project_name
+        )
+
+
+def generate_schema_yml(
+    config: AdapterRequiredConfig, project_name: str
+) -> Dict[str, Any]:
+    ctx = SchemaYamlContext(config, project_name)
+    return ctx.to_dict()

core/dbt/context/context_config.py

@@ -0,0 +1,276 @@
+from abc import abstractmethod
+from copy import deepcopy
+from dataclasses import dataclass
+from typing import List, Iterator, Dict, Any, TypeVar, Generic
+
+from dbt.config import RuntimeConfig, Project, IsFQNResource
+from dbt.contracts.graph.model_config import BaseConfig, get_config_for
+from dbt.exceptions import InternalException
+from dbt.node_types import NodeType
+from dbt.utils import fqn_search
+
+
+@dataclass
+class ModelParts(IsFQNResource):
+    fqn: List[str]
+    resource_type: NodeType
+    package_name: str
+
+
+T = TypeVar('T')  # any old type
+C = TypeVar('C', bound=BaseConfig)
+
+
+class ConfigSource:
+    def __init__(self, project):
+        self.project = project
+
+    def get_config_dict(self, resource_type: NodeType):
+        ...
+
+
+class UnrenderedConfig(ConfigSource):
+    def __init__(self, project: Project):
+        self.project = project
+
+    def get_config_dict(self, resource_type: NodeType) -> Dict[str, Any]:
+        unrendered = self.project.unrendered.project_dict
+        if resource_type == NodeType.Seed:
+            model_configs = unrendered.get('seeds')
+        elif resource_type == NodeType.Snapshot:
+            model_configs = unrendered.get('snapshots')
+        elif resource_type == NodeType.Source:
+            model_configs = unrendered.get('sources')
+        else:
+            model_configs = unrendered.get('models')
+
+        if model_configs is None:
+            return {}
+        else:
+            return model_configs
+
+
+class RenderedConfig(ConfigSource):
+    def __init__(self, project: Project):
+        self.project = project
+
+    def get_config_dict(self, resource_type: NodeType) -> Dict[str, Any]:
+        if resource_type == NodeType.Seed:
+            model_configs = self.project.seeds
+        elif resource_type == NodeType.Snapshot:
+            model_configs = self.project.snapshots
+        elif resource_type == NodeType.Source:
+            model_configs = self.project.sources
+        else:
+            model_configs = self.project.models
+        return model_configs
+
+
+class BaseContextConfigGenerator(Generic[T]):
+    def __init__(self, active_project: RuntimeConfig):
+        self._active_project = active_project
+
+    def get_config_source(self, project: Project) -> ConfigSource:
+        return RenderedConfig(project)
+
+    def get_node_project(self, project_name: str):
+        if project_name == self._active_project.project_name:
+            return self._active_project
+        dependencies = self._active_project.load_dependencies()
+        if project_name not in dependencies:
+            raise InternalException(
+                f'Project name {project_name} not found in dependencies '
+                f'(found {list(dependencies)})'
+            )
+        return dependencies[project_name]
+
+    def _project_configs(
+        self, project: Project, fqn: List[str], resource_type: NodeType
+    ) -> Iterator[Dict[str, Any]]:
+        src = self.get_config_source(project)
+        model_configs = src.get_config_dict(resource_type)
+        for level_config in fqn_search(model_configs, fqn):
+            result = {}
+            for key, value in level_config.items():
+                if key.startswith('+'):
+                    result[key[1:]] = deepcopy(value)
+                elif not isinstance(value, dict):
+                    result[key] = deepcopy(value)
+
+            yield result
+
+    def _active_project_configs(
+        self, fqn: List[str], resource_type: NodeType
+    ) -> Iterator[Dict[str, Any]]:
+        return self._project_configs(self._active_project, fqn, resource_type)
+
+    @abstractmethod
+    def _update_from_config(
+        self, result: T, partial: Dict[str, Any], validate: bool = False
+    ) -> T:
+        ...
+
+    @abstractmethod
+    def initial_result(self, resource_type: NodeType, base: bool) -> T:
+        ...
+
+    def calculate_node_config(
+        self,
+        config_calls: List[Dict[str, Any]],
+        fqn: List[str],
+        resource_type: NodeType,
+        project_name: str,
+        base: bool,
+    ) -> BaseConfig:
+        own_config = self.get_node_project(project_name)
+
+        result = self.initial_result(resource_type=resource_type, base=base)
+
+        project_configs = self._project_configs(own_config, fqn, resource_type)
+        for fqn_config in project_configs:
+            result = self._update_from_config(result, fqn_config)
+
+        for config_call in config_calls:
+            result = self._update_from_config(result, config_call)
+
+        if own_config.project_name != self._active_project.project_name:
+            for fqn_config in self._active_project_configs(fqn, resource_type):
+                result = self._update_from_config(result, fqn_config)
+
+        # this is mostly impactful in the snapshot config case
+        return result
+
+    @abstractmethod
+    def calculate_node_config_dict(
+        self,
+        config_calls: List[Dict[str, Any]],
+        fqn: List[str],
+        resource_type: NodeType,
+        project_name: str,
+        base: bool,
+    ) -> Dict[str, Any]:
+        ...
+
+
+class ContextConfigGenerator(BaseContextConfigGenerator[C]):
+    def __init__(self, active_project: RuntimeConfig):
+        self._active_project = active_project
+
+    def get_config_source(self, project: Project) -> ConfigSource:
+        return RenderedConfig(project)
+
+    def initial_result(self, resource_type: NodeType, base: bool) -> C:
+        # defaults, own_config, config calls, active_config (if != own_config)
+        config_cls = get_config_for(resource_type, base=base)
+        # Calculate the defaults. We don't want to validate the defaults,
+        # because it might be invalid in the case of required config members
+        # (such as on snapshots!)
+        result = config_cls.from_dict({}, validate=False)
+        return result
+
+    def _update_from_config(
+        self, result: C, partial: Dict[str, Any], validate: bool = False
+    ) -> C:
+        translated = self._active_project.credentials.translate_aliases(
+            partial
+        )
+        return result.update_from(
+            translated,
+            self._active_project.credentials.type,
+            validate=validate
+        )
+
+    def calculate_node_config_dict(
+        self,
+        config_calls: List[Dict[str, Any]],
+        fqn: List[str],
+        resource_type: NodeType,
+        project_name: str,
+        base: bool,
+    ) -> Dict[str, Any]:
+        config = self.calculate_node_config(
+            config_calls=config_calls,
+            fqn=fqn,
+            resource_type=resource_type,
+            project_name=project_name,
+            base=base,
+        )
+        finalized = config.finalize_and_validate()
+        return finalized.to_dict()
+
+
+class UnrenderedConfigGenerator(BaseContextConfigGenerator[Dict[str, Any]]):
+    def get_config_source(self, project: Project) -> ConfigSource:
+        return UnrenderedConfig(project)
+
+    def calculate_node_config_dict(
+        self,
+        config_calls: List[Dict[str, Any]],
+        fqn: List[str],
+        resource_type: NodeType,
+        project_name: str,
+        base: bool,
+    ) -> Dict[str, Any]:
+        return self.calculate_node_config(
+            config_calls=config_calls,
+            fqn=fqn,
+            resource_type=resource_type,
+            project_name=project_name,
+            base=base,
+        )
+
+    def initial_result(
+        self,
+        resource_type: NodeType,
+        base: bool
+    ) -> Dict[str, Any]:
+        return {}
+
+    def _update_from_config(
+        self,
+        result: Dict[str, Any],
+        partial: Dict[str, Any],
+        validate: bool = False,
+    ) -> Dict[str, Any]:
+        translated = self._active_project.credentials.translate_aliases(
+            partial
+        )
+        result.update(translated)
+        return result
+
+
+class ContextConfig:
+    def __init__(
+        self,
+        active_project: RuntimeConfig,
+        fqn: List[str],
+        resource_type: NodeType,
+        project_name: str,
+    ) -> None:
+        self._config_calls: List[Dict[str, Any]] = []
+        self._active_project = active_project
+        self._fqn = fqn
+        self._resource_type = resource_type
+        self._project_name = project_name
+
+    def update_in_model_config(self, opts: Dict[str, Any]) -> None:
+        self._config_calls.append(opts)
+
+    def build_config_dict(
+        self,
+        base: bool = False,
+        *,
+        rendered: bool = True,
+    ) -> Dict[str, Any]:
+        if rendered:
+            src = ContextConfigGenerator(self._active_project)
+        else:
+            src = UnrenderedConfigGenerator(self._active_project)
+
+        return src.calculate_node_config_dict(
+            config_calls=self._config_calls,
+            fqn=self._fqn,
+            resource_type=self._resource_type,
+            project_name=self._project_name,
+            base=base,
+        )

core/dbt/context/docs.py

@@ -0,0 +1,80 @@
+from typing import (
+    Any, Dict, Union
+)
+
+from dbt.exceptions import (
+    doc_invalid_args,
+    doc_target_not_found,
+)
+from dbt.config.runtime import RuntimeConfig
+from dbt.contracts.graph.compiled import CompileResultNode
+from dbt.contracts.graph.manifest import Manifest
+from dbt.contracts.graph.parsed import ParsedMacro
+
+from dbt.context.base import contextmember
+from dbt.context.configured import SchemaYamlContext
+
+
+class DocsRuntimeContext(SchemaYamlContext):
+    def __init__(
+        self,
+        config: RuntimeConfig,
+        node: Union[ParsedMacro, CompileResultNode],
+        manifest: Manifest,
+        current_project: str,
+    ) -> None:
+        super().__init__(config, current_project)
+        self.node = node
+        self.manifest = manifest
+
+    @contextmember
+    def doc(self, *args: str) -> str:
+        """The `doc` function is used to reference docs blocks in schema.yml
+        files. It is analogous to the `ref` function. For more information,
+        consult the Documentation guide.
+
+        > orders.md:
+
+            {% docs orders %}
+            # docs
+            - go
+            - here
+            {% enddocs %}
+
+        > schema.yml
+
+            version: 2
+                models:
+                  - name: orders
+                    description: "{{ doc('orders') }}"
+        """
+        # when you call doc(), this is what happens at runtime
+        if len(args) == 1:
+            doc_package_name = None
+            doc_name = args[0]
+        elif len(args) == 2:
+            doc_package_name, doc_name = args
+        else:
+            doc_invalid_args(self.node, args)
+
+        target_doc = self.manifest.resolve_doc(
+            doc_name,
+            doc_package_name,
+            self._project_name,
+            self.node.package_name,
+        )
+
+        if target_doc is None:
+            doc_target_not_found(self.node, doc_name, doc_package_name)
+
+        return target_doc.block_contents
+
+
+def generate_runtime_docs(
+    config: RuntimeConfig,
+    target: Any,
+    manifest: Manifest,
+    current_project: str,
+) -> Dict[str, Any]:
+    ctx = DocsRuntimeContext(config, target, manifest, current_project)
+    return ctx.to_dict()

core/dbt/context/macros.py

@@ -0,0 +1,153 @@
+from typing import (
+    Any, Dict, Iterable, Union, Optional, List, Iterator, Mapping, Set
+)
+
+from dbt.clients.jinja import MacroGenerator, MacroStack
+from dbt.contracts.graph.parsed import ParsedMacro
+from dbt.include.global_project import PROJECT_NAME as GLOBAL_PROJECT_NAME
+from dbt.exceptions import (
+    raise_duplicate_macro_name, raise_compiler_error
+)
+
+
+FlatNamespace = Dict[str, MacroGenerator]
+NamespaceMember = Union[FlatNamespace, MacroGenerator]
+FullNamespace = Dict[str, NamespaceMember]
+
+
+class MacroNamespace(Mapping):
+    def __init__(
+        self,
+        global_namespace: FlatNamespace,
+        local_namespace: FlatNamespace,
+        global_project_namespace: FlatNamespace,
+        packages: Dict[str, FlatNamespace],
+    ):
+        self.global_namespace: FlatNamespace = global_namespace
+        self.local_namespace: FlatNamespace = local_namespace
+        self.packages: Dict[str, FlatNamespace] = packages
+        self.global_project_namespace: FlatNamespace = global_project_namespace
+
+    def _search_order(self) -> Iterable[Union[FullNamespace, FlatNamespace]]:
+        yield self.local_namespace
+        yield self.global_namespace
+        yield self.packages
+        yield {
+            GLOBAL_PROJECT_NAME: self.global_project_namespace,
+        }
+        yield self.global_project_namespace
+
+    def _keys(self) -> Set[str]:
+        keys: Set[str] = set()
+        for search in self._search_order():
+            keys.update(search)
+        return keys
+
+    def __iter__(self) -> Iterator[str]:
+        for key in self._keys():
+            yield key
+
+    def __len__(self):
+        return len(self._keys())
+
+    def __getitem__(self, key: str) -> NamespaceMember:
+        for dct in self._search_order():
+            if key in dct:
+                return dct[key]
+        raise KeyError(key)
+
+    def get_from_package(
+        self, package_name: Optional[str], name: str
+    ) -> Optional[MacroGenerator]:
+        pkg: FlatNamespace
+        if package_name is None:
+            return self.get(name)
+        elif package_name == GLOBAL_PROJECT_NAME:
+            return self.global_project_namespace.get(name)
+        elif package_name in self.packages:
+            return self.packages[package_name].get(name)
+        else:
+            raise_compiler_error(
+                f"Could not find package '{package_name}'"
+            )
+
+
+class MacroNamespaceBuilder:
+    def __init__(
+        self,
+        root_package: str,
+        search_package: str,
+        thread_ctx: MacroStack,
+        internal_packages: List[str],
+        node: Optional[Any] = None,
+    ) -> None:
+        self.root_package = root_package
+        self.search_package = search_package
+        self.internal_package_names = set(internal_packages)
+        self.internal_package_names_order = internal_packages
+        self.globals: FlatNamespace = {}
+        self.locals: FlatNamespace = {}
+        self.internal_packages: Dict[str, FlatNamespace] = {}
+        self.packages: Dict[str, FlatNamespace] = {}
+        self.thread_ctx = thread_ctx
+        self.node = node
+
+    def _add_macro_to(
+        self,
+        heirarchy: Dict[str, FlatNamespace],
+        macro: ParsedMacro,
+        macro_func: MacroGenerator,
+    ):
+        if macro.package_name in heirarchy:
+            namespace = heirarchy[macro.package_name]
+        else:
+            namespace = {}
+            heirarchy[macro.package_name] = namespace
+
+        if macro.name in namespace:
+            raise_duplicate_macro_name(
+                macro_func.macro, macro, macro.package_name
+            )
+        heirarchy[macro.package_name][macro.name] = macro_func
+
+    def add_macro(self, macro: ParsedMacro, ctx: Dict[str, Any]):
+        macro_name: str = macro.name
+
+        macro_func: MacroGenerator = MacroGenerator(
+            macro, ctx, self.node, self.thread_ctx
+        )
+
+        # internal macros (from plugins) will be processed separately from
+        # project macros, so store them in a different place
+        if macro.package_name in self.internal_package_names:
+            self._add_macro_to(self.internal_packages, macro, macro_func)
+        else:
+            self._add_macro_to(self.packages, macro, macro_func)
+
+            if macro.package_name == self.search_package:
+                self.locals[macro_name] = macro_func
+            elif macro.package_name == self.root_package:
+                self.globals[macro_name] = macro_func
+
+    def add_macros(self, macros: Iterable[ParsedMacro], ctx: Dict[str, Any]):
+        for macro in macros:
+            self.add_macro(macro, ctx)
+
+    def build_namespace(
+        self, macros: Iterable[ParsedMacro], ctx: Dict[str, Any]
+    ) -> MacroNamespace:
+        self.add_macros(macros, ctx)
+
+        # Iterate in reverse-order and overwrite: the packages that are first
+        # in the list are the ones we want to "win".
+        global_project_namespace: FlatNamespace = {}
+        for pkg in reversed(self.internal_package_names_order):
+            if pkg in self.internal_packages:
+                global_project_namespace.update(self.internal_packages[pkg])
+
+        return MacroNamespace(
+            global_namespace=self.globals,
+            local_namespace=self.locals,
+            global_project_namespace=global_project_namespace,
+            packages=self.packages,
+        )

core/dbt/context/manifest.py

@@ -0,0 +1,66 @@
+from typing import List
+
+from dbt.clients.jinja import MacroStack
+from dbt.contracts.connection import AdapterRequiredConfig
+from dbt.contracts.graph.manifest import Manifest
+
+
+from .configured import ConfiguredContext
+from .macros import MacroNamespaceBuilder
+
+
+class ManifestContext(ConfiguredContext):
+    """The Macro context has everything in the target context, plus the macros
+    in the manifest.
+
+    The given macros can override any previous context values, which will be
+    available as if they were accessed relative to the package name.
+    """
+    def __init__(
+        self,
+        config: AdapterRequiredConfig,
+        manifest: Manifest,
+        search_package: str,
+    ) -> None:
+        super().__init__(config)
+        self.manifest = manifest
+        self.search_package = search_package
+        self.macro_stack = MacroStack()
+        builder = self._get_namespace_builder()
+        self.namespace = builder.build_namespace(
+            self.manifest.macros.values(),
+            self._ctx,
+        )
+
+    def _get_namespace_builder(self) -> MacroNamespaceBuilder:
+        # avoid an import loop
+        from dbt.adapters.factory import get_adapter_package_names
+        internal_packages: List[str] = get_adapter_package_names(
+            self.config.credentials.type
+        )
+        return MacroNamespaceBuilder(
+            self.config.project_name,
+            self.search_package,
+            self.macro_stack,
+            internal_packages,
+            None,
+        )
+
+    def to_dict(self):
+        dct = super().to_dict()
+        dct.update(self.namespace)
+        return dct
+
+
+class QueryHeaderContext(ManifestContext):
+    def __init__(
+        self, config: AdapterRequiredConfig, manifest: Manifest
+    ) -> None:
+        super().__init__(config, manifest, config.project_name)
+
+
+def generate_query_header_context(
+    config: AdapterRequiredConfig, manifest: Manifest
+):
+    ctx = QueryHeaderContext(config, manifest)
+    return ctx.to_dict()

core/dbt/context/operation.py

@@ -1,29 +0,0 @@
-import dbt.context.common
-from dbt.context import runtime
-from dbt.exceptions import raise_compiler_error
-
-
-class RefResolver(runtime.BaseRefResolver):
-    def __call__(self, *args):
-        # When you call ref(), this is what happens at operation runtime
-        target_model, name = self.resolve(args)
-        return self.create_relation(target_model, name)
-
-    def create_ephemeral_relation(self, target_model, name):
-        # In operations, we can't ref() ephemeral nodes, because ParsedMacros
-        # do not support set_cte
-        raise_compiler_error(
-            'Operations can not ref() ephemeral nodes, but {} is ephemeral'
-            .format(target_model.name),
-            self.model
-        )
-
-
-class Provider(runtime.Provider):
-    ref = RefResolver
-
-
-def generate(model, runtime_config, manifest):
-    return dbt.context.common.generate_execute_macro(
-        model, runtime_config, manifest, Provider()
-    )

core/dbt/context/parser.py

@@ -1,146 +0,0 @@
-import dbt.exceptions
-
-import dbt.context.common
-from dbt.adapters.factory import get_adapter
-
-
-def docs(unparsed, docrefs, column_name=None):
-
-    def do_docs(*args):
-        if len(args) != 1 and len(args) != 2:
-            dbt.exceptions.doc_invalid_args(unparsed, args)
-        doc_package_name = ''
-        doc_name = args[0]
-        if len(args) == 2:
-            doc_package_name = args[1]
-
-        docref = {
-            'documentation_package': doc_package_name,
-            'documentation_name': doc_name,
-        }
-        if column_name is not None:
-            docref['column_name'] = column_name
-
-        docrefs.append(docref)
-
-        # IDK
-        return True
-
-    return do_docs
-
-
-class Config(object):
-    def __init__(self, model, source_config):
-        self.model = model
-        self.source_config = source_config
-
-    def _transform_config(self, config):
-        for oldkey in ('pre_hook', 'post_hook'):
-            if oldkey in config:
-                newkey = oldkey.replace('_', '-')
-                if newkey in config:
-                    dbt.exceptions.raise_compiler_error(
-                        'Invalid config, has conflicting keys "{}" and "{}"'
-                        .format(oldkey, newkey),
-                        self.model
-                    )
-                config[newkey] = config.pop(oldkey)
-        return config
-
-    def __call__(self, *args, **kwargs):
-        if len(args) == 1 and len(kwargs) == 0:
-            opts = args[0]
-        elif len(args) == 0 and len(kwargs) > 0:
-            opts = kwargs
-        else:
-            dbt.exceptions.raise_compiler_error(
-                "Invalid inline model config",
-                self.model)
-
-        opts = self._transform_config(opts)
-
-        self.source_config.update_in_model_config(opts)
-        return ''
-
-    def set(self, name, value):
-        return self.__call__({name: value})
-
-    def require(self, name, validator=None):
-        return ''
-
-    def get(self, name, validator=None, default=None):
-        return ''
-
-
-class DatabaseWrapper(dbt.context.common.BaseDatabaseWrapper):
-    """The parser subclass of the database wrapper applies any explicit
-    parse-time overrides.
-    """
-    def __getattr__(self, name):
-        override = (name in self.adapter._available_ and
-                    name in self.adapter._parse_replacements_)
-
-        if override:
-            return self.adapter._parse_replacements_[name]
-        elif name in self.adapter._available_:
-            return getattr(self.adapter, name)
-        else:
-            raise AttributeError(
-                "'{}' object has no attribute '{}'".format(
-                    self.__class__.__name__, name
-                )
-            )
-
-
-class Var(dbt.context.common.Var):
-    def get_missing_var(self, var_name):
-        # in the parser, just always return None.
-        return None
-
-
-class RefResolver(dbt.context.common.BaseResolver):
-    def __call__(self, *args):
-        # When you call ref(), this is what happens at parse time
-        if len(args) == 1 or len(args) == 2:
-            self.model.refs.append(list(args))
-
-        else:
-            dbt.exceptions.ref_invalid_args(self.model, args)
-
-        return self.Relation.create_from_node(self.config, self.model)
-
-
-class SourceResolver(dbt.context.common.BaseResolver):
-    def __call__(self, source_name, table_name):
-        # When you call source(), this is what happens at parse time
-        self.model.sources.append([source_name, table_name])
-        return self.Relation.create_from_node(self.config, self.model)
-
-
-class Provider(object):
-    execute = False
-    Config = Config
-    DatabaseWrapper = DatabaseWrapper
-    Var = Var
-    ref = RefResolver
-    source = SourceResolver
-
-
-def generate(model, runtime_config, manifest, source_config):
-    # during parsing, we don't have a connection, but we might need one, so we
-    # have to acquire it.
-    # In the future, it would be nice to lazily open the connection, as in some
-    # projects it would be possible to parse without connecting to the db
-    with get_adapter(runtime_config).connection_named(model.get('name')):
-        return dbt.context.common.generate(
-            model, runtime_config, manifest, source_config, Provider()
-        )
-
-
-def generate_macro(model, runtime_config, manifest):
-    # parser.generate_macro is called by the get_${attr}_func family of Parser
-    # methods, which preparse and cache the generate_${attr}_name family of
-    # macros for use during parsing
-    return dbt.context.common.generate_execute_macro(
-        model, runtime_config, manifest, Provider()
-    )

core/dbt/context/runtime.py

@@ -1,150 +0,0 @@
-from dbt.utils import get_materialization, add_ephemeral_model_prefix
-
-import dbt.clients.jinja
-import dbt.context.common
-import dbt.flags
-from dbt.parser import ParserUtils
-
-from dbt.logger import GLOBAL_LOGGER as logger  # noqa
-
-
-class BaseRefResolver(dbt.context.common.BaseResolver):
-    def resolve(self, args):
-        name = None
-        package = None
-
-        if len(args) == 1:
-            name = args[0]
-        elif len(args) == 2:
-            package, name = args
-        else:
-            dbt.exceptions.ref_invalid_args(self.model, args)
-
-        target_model = ParserUtils.resolve_ref(
-            self.manifest,
-            name,
-            package,
-            self.current_project,
-            self.model.package_name)
-
-        if target_model is None or target_model is ParserUtils.DISABLED:
-            dbt.exceptions.ref_target_not_found(
-                self.model,
-                name,
-                package)
-        return target_model, name
-
-    def create_ephemeral_relation(self, target_model, name):
-        self.model.set_cte(target_model.unique_id, None)
-        return self.Relation.create(
-            type=self.Relation.CTE,
-            identifier=add_ephemeral_model_prefix(name)
-        ).quote(identifier=False)
-
-    def create_relation(self, target_model, name):
-        if get_materialization(target_model) == 'ephemeral':
-            return self.create_ephemeral_relation(target_model, name)
-        else:
-            return self.Relation.create_from_node(self.config, target_model)
-
-
-class RefResolver(BaseRefResolver):
-    def validate(self, resolved, args):
-        if resolved.unique_id not in self.model.depends_on.get('nodes'):
-            dbt.exceptions.ref_bad_context(self.model, args)
-
-    def __call__(self, *args):
-        # When you call ref(), this is what happens at runtime
-        target_model, name = self.resolve(args)
-        self.validate(target_model, args)
-        return self.create_relation(target_model, name)
-
-
-class SourceResolver(dbt.context.common.BaseResolver):
-    def resolve(self, source_name, table_name):
-        target_source = ParserUtils.resolve_source(
-            self.manifest,
-            source_name,
-            table_name,
-            self.current_project,
-            self.model.package_name
-        )
-
-        if target_source is None:
-            dbt.exceptions.source_target_not_found(
-                self.model,
-                source_name,
-                table_name)
-        return target_source
-
-    def __call__(self, source_name, table_name):
-        """When you call source(), this is what happens at runtime"""
-        target_source = self.resolve(source_name, table_name)
-        return self.Relation.create_from_source(target_source)
-
-
-class Config:
-    def __init__(self, model, source_config=None):
-        self.model = model
-        # we never use or get a source config, only the parser cares
-
-    def __call__(*args, **kwargs):
-        return ''
-
-    def set(self, name, value):
-        return self.__call__({name: value})
-
-    def _validate(self, validator, value):
-        validator(value)
-
-    def require(self, name, validator=None):
-        if name not in self.model['config']:
-            dbt.exceptions.missing_config(self.model, name)
-
-        to_return = self.model['config'][name]
-
-        if validator is not None:
-            self._validate(validator, to_return)
-
-        return to_return
-
-    def get(self, name, validator=None, default=None):
-        to_return = self.model['config'].get(name, default)
-
-        if validator is not None and default is not None:
-            self._validate(validator, to_return)
-
-        return to_return
-
-
-class DatabaseWrapper(dbt.context.common.BaseDatabaseWrapper):
-    """The runtime database wrapper exposes everything the adapter marks
-    available.
-    """
-    def __getattr__(self, name):
-        if name in self.adapter._available_:
-            return getattr(self.adapter, name)
-        else:
-            raise AttributeError(
-                "'{}' object has no attribute '{}'".format(
-                    self.__class__.__name__, name
-                )
-            )
-
-
-class Var(dbt.context.common.Var):
-    pass
-
-
-class Provider(object):
-    execute = True
-    Config = Config
-    DatabaseWrapper = DatabaseWrapper
-    Var = Var
-    ref = RefResolver
-    source = SourceResolver
-
-
-def generate(model, runtime_config, manifest):
-    return dbt.context.common.generate(
-        model, runtime_config, manifest, None, Provider())

core/dbt/context/target.py

@@ -0,0 +1,84 @@
+from typing import Any, Dict
+
+from dbt.contracts.connection import HasCredentials
+
+from dbt.context.base import (
+    BaseContext, contextproperty
+)
+
+
+class TargetContext(BaseContext):
+    def __init__(self, config: HasCredentials, cli_vars: Dict[str, Any]):
+        super().__init__(cli_vars=cli_vars)
+        self.config = config
+
+    @contextproperty
+    def target(self) -> Dict[str, Any]:
+        """`target` contains information about your connection to the warehouse
+        (specified in profiles.yml). Some configs are shared between all
+        adapters, while others are adapter-specific.
+
+        Common:
+
+            |----------|-----------|------------------------------------------|
+            | Variable |  Example  |                Description               |
+            |----------|-----------|------------------------------------------|
+            |   name   |    dev    | Name of the active target                |
+            |----------|-----------|------------------------------------------|
+            |  schema  | dbt_alice | Name of the dbt schema (or, dataset on   |
+            |          |           | BigQuery)                                |
+            |----------|-----------|------------------------------------------|
+            |   type   |  postgres | The active adapter being used.           |
+            |----------|-----------|------------------------------------------|
+            | threads  |    4      | The number of threads in use by dbt      |
+            |----------|-----------|------------------------------------------|
+
+        Snowflake:
+
+            |----------|-----------|------------------------------------------|
+            | Variable |  Example  |                Description               |
+            |----------|-----------|------------------------------------------|
+            | database |    RAW    | The active target's database.            |
+            |----------|-----------|------------------------------------------|
+            | warehouse| TRANSFORM | The active target's warehouse.           |
+            |----------|-----------|------------------------------------------|
+            |   user   |  USERNAME | The active target's user                 |
+            |----------|-----------|------------------------------------------|
+            | role     |  ROLENAME | The active target's role                 |
+            |----------|-----------|------------------------------------------|
+            | account  |  abc123   | The active target's account              |
+            |----------|-----------|------------------------------------------|
+
+        Postgres/Redshift:
+
+            |----------|-------------------|----------------------------------|
+            | Variable |  Example          |        Description               |
+            |----------|-------------------|----------------------------------|
+            |  dbname  | analytics         | The active target's database.    |
+            |----------|-------------------|----------------------------------|
+            |  host    | abc123.us-west-2. | The active target's host.        |
+            |          | redshift.amazonaws|                                  |
+            |          |  .com             |                                  |
+            |----------|-------------------|----------------------------------|
+            |   user   |  dbt_user         |  The active target's user        |
+            |----------|-------------------|----------------------------------|
+            |   port   |    5439           | The active target's port         |
+            |----------|-------------------|----------------------------------|
+
+        BigQuery:
+
+            |----------|-----------|------------------------------------------|
+            | Variable |  Example  |                Description               |
+            |----------|-----------|------------------------------------------|
+            | project  |  abc-123  | The active target's project.             |
+            |----------|-----------|------------------------------------------|
+
+        """
+        return self.config.to_target_dict()
+
+
+def generate_target_context(
+    config: HasCredentials, cli_vars: Dict[str, Any]
+) -> Dict[str, Any]:
+    ctx = TargetContext(config, cli_vars)
+    return ctx.to_dict()

core/dbt/contracts/common.py

@@ -1,11 +0,0 @@
-
-
-def named_property(name, doc=None):
-    def get_prop(self):
-        return self._contents.get(name)
-
-    def set_prop(self, value):
-        self._contents[name] = value
-        self.validate()
-
-    return property(get_prop, set_prop, doc=doc)

core/dbt/contracts/connection.py

@@ -1,71 +1,228 @@
-from dbt.api.object import APIObject
-from dbt.contracts.common import named_property
+import abc
+import itertools
+from dataclasses import dataclass, field
+from typing import (
+    Any, ClassVar, Dict, Tuple, Iterable, Optional, NewType, List, Callable,
+)
+from typing_extensions import Protocol
+
+from hologram import JsonSchemaMixin
+from hologram.helpers import (
+    StrEnum, register_pattern, ExtensibleJsonSchemaMixin
+)
+
+from dbt.contracts.util import Replaceable
+from dbt.exceptions import InternalException
+from dbt.utils import translate_aliases
+
+from dbt.logger import GLOBAL_LOGGER as logger
 
 
-CONNECTION_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'type': {
-            'type': 'string',
-            # valid python identifiers only
-            'pattern': r'^[A-Za-z_][A-Za-z0-9_]+$',
-        },
-        'name': {
-            'type': ['null', 'string'],
-        },
-        'state': {
-            'enum': ['init', 'open', 'closed', 'fail'],
-        },
-        'transaction_open': {
-            'type': 'boolean',
-        },
-        # we can't serialize this so we can't require it as part of the
-        # contract.
-        # 'handle': {
-        #     'type': ['null', 'object'],
-        # },
-        # credentials are validated separately by the adapter packages
-        'credentials': {
-            'description': (
-                'The credentials object here should match the connection type.'
-            ),
-            'type': 'object',
-            'additionalProperties': True,
-        }
-    },
-    'required': [
-        'type', 'name', 'state', 'transaction_open', 'credentials'
-    ],
-}
+Identifier = NewType('Identifier', str)
+register_pattern(Identifier, r'^[A-Za-z_][A-Za-z0-9_]+$')
 
 
-class Connection(APIObject):
-    SCHEMA = CONNECTION_CONTRACT
+@dataclass
+class AdapterResponse(JsonSchemaMixin):
+    _message: str
+    code: Optional[str] = None
+    rows_affected: Optional[int] = None
 
-    def __init__(self, credentials, *args, **kwargs):
-        # we can't serialize handles
-        self._handle = kwargs.pop('handle')
-        super(Connection, self).__init__(credentials=credentials.serialize(),
-                                         *args, **kwargs)
-        # this will validate itself in its own __init__.
-        self._credentials = credentials
+    def __str__(self):
+        return self._message
+
+
+class ConnectionState(StrEnum):
+    INIT = 'init'
+    OPEN = 'open'
+    CLOSED = 'closed'
+    FAIL = 'fail'
+
+
+@dataclass(init=False)
+class Connection(ExtensibleJsonSchemaMixin, Replaceable):
+    type: Identifier
+    name: Optional[str]
+    state: ConnectionState = ConnectionState.INIT
+    transaction_open: bool = False
+    # prevent serialization
+    _handle: Optional[Any] = None
+    _credentials: JsonSchemaMixin = field(init=False)
+
+    def __init__(
+        self,
+        type: Identifier,
+        name: Optional[str],
+        credentials: JsonSchemaMixin,
+        state: ConnectionState = ConnectionState.INIT,
+        transaction_open: bool = False,
+        handle: Optional[Any] = None,
+    ) -> None:
+        self.type = type
+        self.name = name
+        self.state = state
+        self.credentials = credentials
+        self.transaction_open = transaction_open
+        self.handle = handle
 
     @property
     def credentials(self):
         return self._credentials
 
+    @credentials.setter
+    def credentials(self, value):
+        self._credentials = value
+
     @property
     def handle(self):
+        if isinstance(self._handle, LazyHandle):
+            try:
+                # this will actually change 'self._handle'.
+                self._handle.resolve(self)
+            except RecursionError as exc:
+                raise InternalException(
+                    "A connection's open() method attempted to read the "
+                    "handle value"
+                ) from exc
         return self._handle
 
     @handle.setter
     def handle(self, value):
         self._handle = value
 
-    name = named_property('name', 'The name of this connection')
-    state = named_property('state', 'The state of the connection')
-    transaction_open = named_property(
-        'transaction_open',
-        'True if there is an open transaction, False otherwise.'
-    )
+
+class LazyHandle:
+    """Opener must be a callable that takes a Connection object and opens the
+    connection, updating the handle on the Connection.
+    """
+
+    def __init__(self, opener: Callable[[Connection], Connection]):
+        self.opener = opener
+
+    def resolve(self, connection: Connection) -> Connection:
+        logger.debug(
+            'Opening a new connection, currently in state {}'
+            .format(connection.state)
+        )
+        return self.opener(connection)
+
+
+# see https://github.com/python/mypy/issues/4717#issuecomment-373932080
+# and https://github.com/python/mypy/issues/5374
+# for why we have type: ignore. Maybe someday dataclasses + abstract classes
+# will work.
+@dataclass  # type: ignore
+class Credentials(
+    ExtensibleJsonSchemaMixin,
+    Replaceable,
+    metaclass=abc.ABCMeta
+):
+    database: str
+    schema: str
+    _ALIASES: ClassVar[Dict[str, str]] = field(default={}, init=False)
+
+    @abc.abstractproperty
+    def type(self) -> str:
+        raise NotImplementedError(
+            'type not implemented for base credentials class'
+        )
+
+    def connection_info(
+        self, *, with_aliases: bool = False
+    ) -> Iterable[Tuple[str, Any]]:
+        """Return an ordered iterator of key/value pairs for pretty-printing.
+        """
+        as_dict = self.to_dict(omit_none=False, with_aliases=with_aliases)
+        connection_keys = set(self._connection_keys())
+        aliases: List[str] = []
+        if with_aliases:
+            aliases = [
+                k for k, v in self._ALIASES.items() if v in connection_keys
+            ]
+        for key in itertools.chain(self._connection_keys(), aliases):
+            if key in as_dict:
+                yield key, as_dict[key]
+
+    @abc.abstractmethod
+    def _connection_keys(self) -> Tuple[str, ...]:
+        raise NotImplementedError
+
+    @classmethod
+    def from_dict(cls, data):
+        data = cls.translate_aliases(data)
+        return super().from_dict(data)
+
+    @classmethod
+    def translate_aliases(
+        cls, kwargs: Dict[str, Any], recurse: bool = False
+    ) -> Dict[str, Any]:
+        return translate_aliases(kwargs, cls._ALIASES, recurse)
+
+    def to_dict(self, omit_none=True, validate=False, *, with_aliases=False):
+        serialized = super().to_dict(omit_none=omit_none, validate=validate)
+        if with_aliases:
+            serialized.update({
+                new_name: serialized[canonical_name]
+                for new_name, canonical_name in self._ALIASES.items()
+                if canonical_name in serialized
+            })
+        return serialized
+
+
+class UserConfigContract(Protocol):
+    send_anonymous_usage_stats: bool
+    use_colors: Optional[bool]
+    partial_parse: Optional[bool]
+    printer_width: Optional[int]
+
+    def set_values(self, cookie_dir: str) -> None:
+        ...
+
+    def to_dict(
+        self, omit_none: bool = True, validate: bool = False
+    ) -> Dict[str, Any]:
+        ...
+
+
+class HasCredentials(Protocol):
+    credentials: Credentials
+    profile_name: str
+    config: UserConfigContract
+    target_name: str
+    threads: int
+
+    def to_target_dict(self):
+        raise NotImplementedError('to_target_dict not implemented')
+
+
+DEFAULT_QUERY_COMMENT = '''
+{%- set comment_dict = {} -%}
+{%- do comment_dict.update(
+    app='dbt',
+    dbt_version=dbt_version,
+    profile_name=target.get('profile_name'),
+    target_name=target.get('target_name'),
+) -%}
+{%- if node is not none -%}
+  {%- do comment_dict.update(
+    node_id=node.unique_id,
+  ) -%}
+{% else %}
+  {# in the node context, the connection name is the node_id #}
+  {%- do comment_dict.update(connection_name=connection_name) -%}
+{%- endif -%}
+{{ return(tojson(comment_dict)) }}
+'''
+
+
+@dataclass
+class QueryComment(JsonSchemaMixin):
+    comment: str = DEFAULT_QUERY_COMMENT
+    append: bool = False
+
+
+class AdapterRequiredConfig(HasCredentials, Protocol):
+    project_name: str
+    query_comment: QueryComment
+    cli_vars: Dict[str, Any]
+    target_path: str

core/dbt/contracts/files.py

@@ -0,0 +1,167 @@
+import hashlib
+import os
+from dataclasses import dataclass, field
+from typing import List, Optional, Union
+
+from hologram import JsonSchemaMixin
+
+from dbt.exceptions import InternalException
+
+from .util import MacroKey, SourceKey
+
+
+MAXIMUM_SEED_SIZE = 1 * 1024 * 1024
+MAXIMUM_SEED_SIZE_NAME = '1MB'
+
+
+@dataclass
+class FilePath(JsonSchemaMixin):
+    searched_path: str
+    relative_path: str
+    project_root: str
+
+    @property
+    def search_key(self) -> str:
+        # TODO: should this be project name + path relative to project root?
+        return self.absolute_path
+
+    @property
+    def full_path(self) -> str:
+        # useful for symlink preservation
+        return os.path.join(
+            self.project_root, self.searched_path, self.relative_path
+        )
+
+    @property
+    def absolute_path(self) -> str:
+        return os.path.abspath(self.full_path)
+
+    @property
+    def original_file_path(self) -> str:
+        # this is mostly used for reporting errors. It doesn't show the project
+        # name, should it?
+        return os.path.join(
+            self.searched_path, self.relative_path
+        )
+
+    def seed_too_large(self) -> bool:
+        """Return whether the file this represents is over the seed size limit
+        """
+        return os.stat(self.full_path).st_size > MAXIMUM_SEED_SIZE
+
+
+@dataclass
+class FileHash(JsonSchemaMixin):
+    name: str  # the hash type name
+    checksum: str  # the hashlib.hash_type().hexdigest() of the file contents
+
+    @classmethod
+    def empty(cls):
+        return FileHash(name='none', checksum='')
+
+    @classmethod
+    def path(cls, path: str):
+        return FileHash(name='path', checksum=path)
+
+    def __eq__(self, other):
+        if not isinstance(other, FileHash):
+            return NotImplemented
+
+        if self.name == 'none' or self.name != other.name:
+            return False
+
+        return self.checksum == other.checksum
+
+    def compare(self, contents: str) -> bool:
+        """Compare the file contents with the given hash"""
+        if self.name == 'none':
+            return False
+
+        return self.from_contents(contents, name=self.name) == self.checksum
+
+    @classmethod
+    def from_contents(cls, contents: str, name='sha256') -> 'FileHash':
+        """Create a file hash from the given file contents. The hash is always
+        the utf-8 encoding of the contents given, because dbt only reads files
+        as utf-8.
+        """
+        data = contents.encode('utf-8')
+        checksum = hashlib.new(name, data).hexdigest()
+        return cls(name=name, checksum=checksum)
+
+
+@dataclass
+class RemoteFile(JsonSchemaMixin):
+    @property
+    def searched_path(self) -> str:
+        return 'from remote system'
+
+    @property
+    def relative_path(self) -> str:
+        return 'from remote system'
+
+    @property
+    def absolute_path(self) -> str:
+        return 'from remote system'
+
+    @property
+    def original_file_path(self):
+        return 'from remote system'
+
+
+@dataclass
+class SourceFile(JsonSchemaMixin):
+    """Define a source file in dbt"""
+    path: Union[FilePath, RemoteFile]  # the path information
+    checksum: FileHash
+    # we don't want to serialize this
+    _contents: Optional[str] = None
+    # the unique IDs contained in this file
+    nodes: List[str] = field(default_factory=list)
+    docs: List[str] = field(default_factory=list)
+    macros: List[str] = field(default_factory=list)
+    sources: List[str] = field(default_factory=list)
+    exposures: List[str] = field(default_factory=list)
+    # any node patches in this file. The entries are names, not unique ids!
+    patches: List[str] = field(default_factory=list)
+    # any macro patches in this file. The entries are package, name pairs.
+    macro_patches: List[MacroKey] = field(default_factory=list)
+    # any source patches in this file. The entries are package, name pairs
+    source_patches: List[SourceKey] = field(default_factory=list)
+
+    @property
+    def search_key(self) -> Optional[str]:
+        if isinstance(self.path, RemoteFile):
+            return None
+        if self.checksum.name == 'none':
+            return None
+        return self.path.search_key
+
+    @property
+    def contents(self) -> str:
+        if self._contents is None:
+            raise InternalException('SourceFile has no contents!')
+        return self._contents
+
+    @contents.setter
+    def contents(self, value):
+        self._contents = value
+
+    @classmethod
+    def empty(cls, path: FilePath) -> 'SourceFile':
+        self = cls(path=path, checksum=FileHash.empty())
+        self.contents = ''
+        return self
+
+    @classmethod
+    def big_seed(cls, path: FilePath) -> 'SourceFile':
+        """Parse seeds over the size limit with just the path"""
+        self = cls(path=path, checksum=FileHash.path(path.original_file_path))
+        self.contents = ''
+        return self
+
+    @classmethod
+    def remote(cls, contents: str) -> 'SourceFile':
+        self = cls(path=RemoteFile(), checksum=FileHash.empty())
+        self.contents = contents
+        return self

core/dbt/contracts/graph/compiled.py

@@ -1,236 +1,226 @@
-from dbt.api import APIObject
-from dbt.utils import deep_merge
-from dbt.contracts.graph.parsed import PARSED_NODE_CONTRACT, \
-    PARSED_MACRO_CONTRACT, ParsedNode
-
-import dbt.compat
-
-import sqlparse
-
-INJECTED_CTE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': 'A single entry in the CTEs list',
-    'properties': {
-        'id': {
-            'type': 'string',
-            'description': 'The id of the CTE',
-        },
-        'sql': {
-            'type': ['string', 'null'],
-            'description': 'The compiled SQL of the CTE',
-            'additionalProperties': True,
-        },
-    },
-    'required': ['id', 'sql'],
-}
-
-
-COMPILED_NODE_CONTRACT = deep_merge(
-    PARSED_NODE_CONTRACT,
-    {
-        # TODO: when we add 'extra_ctes' back in, flip this back to False
-        'additionalProperties': True,
-        'properties': {
-            'compiled': {
-                'description': (
-                    'This is true after the node has been compiled, but ctes '
-                    'have not necessarily been injected into the node.'
-                ),
-                'type': 'boolean'
-            },
-            'compiled_sql': {
-                'type': ['string', 'null'],
-            },
-            'extra_ctes_injected': {
-                'description': (
-                    'This is true after extra ctes have been injected into '
-                    'the compiled node.'
-                ),
-                'type': 'boolean',
-            },
-            'extra_ctes': {
-                'type': 'array',
-                'description': 'The injected CTEs for a model',
-                'items': INJECTED_CTE_CONTRACT,
-            },
-            'injected_sql': {
-                'type': ['string', 'null'],
-                'description': 'The SQL after CTEs have been injected',
-            },
-            'wrapped_sql': {
-                'type': ['string', 'null'],
-                'description': (
-                    'The SQL after it has been wrapped (for tests, '
-                    'operations, and analysis)'
-                ),
-            },
-        },
-        'required': PARSED_NODE_CONTRACT['required'] + [
-            'compiled', 'compiled_sql', 'extra_ctes_injected',
-            'injected_sql', 'extra_ctes'
-        ]
-    }
+from dbt.contracts.graph.parsed import (
+    HasTestMetadata,
+    ParsedNode,
+    ParsedAnalysisNode,
+    ParsedDataTestNode,
+    ParsedHookNode,
+    ParsedModelNode,
+    ParsedExposure,
+    ParsedResource,
+    ParsedRPCNode,
+    ParsedSchemaTestNode,
+    ParsedSeedNode,
+    ParsedSnapshotNode,
+    ParsedSourceDefinition,
+    SeedConfig,
+    TestConfig,
+    same_seeds,
 )
+from dbt.node_types import NodeType
+from dbt.contracts.util import Replaceable
+
+from hologram import JsonSchemaMixin
+from dataclasses import dataclass, field
+from typing import Optional, List, Union, Dict, Type
 
 
-COMPILED_NODES_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': (
-        'A collection of the compiled nodes, stored by their unique IDs.'
-    ),
-    'patternProperties': {
-        '.*': COMPILED_NODE_CONTRACT
-    },
-}
+@dataclass
+class InjectedCTE(JsonSchemaMixin, Replaceable):
+    id: str
+    sql: str
 
 
-COMPILED_MACRO_CONTRACT = PARSED_MACRO_CONTRACT
+@dataclass
+class CompiledNodeMixin(JsonSchemaMixin):
+    # this is a special mixin class to provide a required argument. If a node
+    # is missing a `compiled` flag entirely, it must not be a CompiledNode.
+    compiled: bool
 
 
-COMPILED_MACROS_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': (
-        'A collection of the compiled macros, stored by their unique IDs.'
-    ),
-    'patternProperties': {
-        '.*': COMPILED_MACRO_CONTRACT
-    },
-}
+@dataclass
+class CompiledNode(ParsedNode, CompiledNodeMixin):
+    compiled_sql: Optional[str] = None
+    extra_ctes_injected: bool = False
+    extra_ctes: List[InjectedCTE] = field(default_factory=list)
+    relation_name: Optional[str] = None
 
-
-COMPILED_GRAPH_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': (
-        'The full compiled graph, with both the required nodes and required '
-        'macros.'
-    ),
-    'properties': {
-        'nodes': COMPILED_NODES_CONTRACT,
-        'macros': COMPILED_MACROS_CONTRACT,
-    },
-    'required': ['nodes', 'macros'],
-}
-
-
-def _inject_ctes_into_sql(sql, ctes):
-    """
-    `ctes` is a dict of CTEs in the form:
-
-      {
-        "cte_id_1": "__dbt__CTE__ephemeral as (select * from table)",
-        "cte_id_2": "__dbt__CTE__events as (select id, type from events)"
-      }
-
-    Given `sql` like:
-
-      "with internal_cte as (select * from sessions)
-       select * from internal_cte"
-
-    This will spit out:
-
-      "with __dbt__CTE__ephemeral as (select * from table),
-            __dbt__CTE__events as (select id, type from events),
-            with internal_cte as (select * from sessions)
-       select * from internal_cte"
-
-    (Whitespace enhanced for readability.)
-    """
-    if len(ctes) == 0:
-        return sql
-
-    parsed_stmts = sqlparse.parse(sql)
-    parsed = parsed_stmts[0]
-
-    with_stmt = None
-    for token in parsed.tokens:
-        if token.is_keyword and token.normalized == 'WITH':
-            with_stmt = token
-            break
-
-    if with_stmt is None:
-        # no with stmt, add one, and inject CTEs right at the beginning
-        first_token = parsed.token_first()
-        with_stmt = sqlparse.sql.Token(sqlparse.tokens.Keyword, 'with')
-        parsed.insert_before(first_token, with_stmt)
-    else:
-        # stmt exists, add a comma (which will come after injected CTEs)
-        trailing_comma = sqlparse.sql.Token(sqlparse.tokens.Punctuation, ',')
-        parsed.insert_after(with_stmt, trailing_comma)
-
-    token = sqlparse.sql.Token(
-        sqlparse.tokens.Keyword,
-        ", ".join(c['sql'] for c in ctes)
-    )
-    parsed.insert_after(with_stmt, token)
-
-    return dbt.compat.to_string(parsed)
-
-
-class CompiledNode(ParsedNode):
-    SCHEMA = COMPILED_NODE_CONTRACT
-
-    def prepend_ctes(self, prepended_ctes):
-        self._contents['extra_ctes_injected'] = True
-        self._contents['extra_ctes'] = prepended_ctes
-        self._contents['injected_sql'] = _inject_ctes_into_sql(
-            self.compiled_sql,
-            prepended_ctes
-        )
-        self.validate()
-
-    @property
-    def extra_ctes_injected(self):
-        return self._contents.get('extra_ctes_injected')
-
-    @property
-    def extra_ctes(self):
-        return self._contents.get('extra_ctes')
-
-    @property
-    def compiled(self):
-        return self._contents.get('compiled')
-
-    @compiled.setter
-    def compiled(self, value):
-        self._contents['compiled'] = value
-
-    @property
-    def injected_sql(self):
-        return self._contents.get('injected_sql')
-
-    @property
-    def compiled_sql(self):
-        return self._contents.get('compiled_sql')
-
-    @compiled_sql.setter
-    def compiled_sql(self, value):
-        self._contents['compiled_sql'] = value
-
-    @property
-    def wrapped_sql(self):
-        return self._contents.get('wrapped_sql')
-
-    @wrapped_sql.setter
-    def wrapped_sql(self, value):
-        self._contents['wrapped_sql'] = value
-
-    def set_cte(self, cte_id, sql):
+    def set_cte(self, cte_id: str, sql: str):
         """This is the equivalent of what self.extra_ctes[cte_id] = sql would
         do if extra_ctes were an OrderedDict
         """
         for cte in self.extra_ctes:
-            if cte['id'] == cte_id:
-                cte['sql'] = sql
+            if cte.id == cte_id:
+                cte.sql = sql
                 break
         else:
-            self.extra_ctes.append(
-                {'id': cte_id, 'sql': sql}
-            )
+            self.extra_ctes.append(InjectedCTE(id=cte_id, sql=sql))
 
 
-class CompiledGraph(APIObject):
-    SCHEMA = COMPILED_GRAPH_CONTRACT
+@dataclass
+class CompiledAnalysisNode(CompiledNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Analysis]})
+
+
+@dataclass
+class CompiledHookNode(CompiledNode):
+    resource_type: NodeType = field(
+        metadata={'restrict': [NodeType.Operation]}
+    )
+    index: Optional[int] = None
+
+
+@dataclass
+class CompiledModelNode(CompiledNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Model]})
+
+
+@dataclass
+class CompiledRPCNode(CompiledNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.RPCCall]})
+
+
+@dataclass
+class CompiledSeedNode(CompiledNode):
+    # keep this in sync with ParsedSeedNode!
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Seed]})
+    config: SeedConfig = field(default_factory=SeedConfig)
+
+    @property
+    def empty(self):
+        """ Seeds are never empty"""
+        return False
+
+    def same_body(self, other) -> bool:
+        return same_seeds(self, other)
+
+
+@dataclass
+class CompiledSnapshotNode(CompiledNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Snapshot]})
+
+
+@dataclass
+class CompiledDataTestNode(CompiledNode):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Test]})
+    config: TestConfig = field(default_factory=TestConfig)
+
+
+@dataclass
+class CompiledSchemaTestNode(CompiledNode, HasTestMetadata):
+    # keep this in sync with ParsedSchemaTestNode!
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Test]})
+    column_name: Optional[str] = None
+    config: TestConfig = field(default_factory=TestConfig)
+
+    def same_config(self, other) -> bool:
+        return (
+            self.unrendered_config.get('severity') ==
+            other.unrendered_config.get('severity')
+        )
+
+    def same_column_name(self, other) -> bool:
+        return self.column_name == other.column_name
+
+    def same_contents(self, other) -> bool:
+        if other is None:
+            return False
+
+        return (
+            self.same_config(other) and
+            self.same_fqn(other) and
+            True
+        )
+
+
+CompiledTestNode = Union[CompiledDataTestNode, CompiledSchemaTestNode]
+
+
+PARSED_TYPES: Dict[Type[CompiledNode], Type[ParsedResource]] = {
+    CompiledAnalysisNode: ParsedAnalysisNode,
+    CompiledModelNode: ParsedModelNode,
+    CompiledHookNode: ParsedHookNode,
+    CompiledRPCNode: ParsedRPCNode,
+    CompiledSeedNode: ParsedSeedNode,
+    CompiledSnapshotNode: ParsedSnapshotNode,
+    CompiledDataTestNode: ParsedDataTestNode,
+    CompiledSchemaTestNode: ParsedSchemaTestNode,
+}
+
+
+COMPILED_TYPES: Dict[Type[ParsedResource], Type[CompiledNode]] = {
+    ParsedAnalysisNode: CompiledAnalysisNode,
+    ParsedModelNode: CompiledModelNode,
+    ParsedHookNode: CompiledHookNode,
+    ParsedRPCNode: CompiledRPCNode,
+    ParsedSeedNode: CompiledSeedNode,
+    ParsedSnapshotNode: CompiledSnapshotNode,
+    ParsedDataTestNode: CompiledDataTestNode,
+    ParsedSchemaTestNode: CompiledSchemaTestNode,
+}
+
+
+# for some types, the compiled type is the parsed type, so make this easy
+CompiledType = Union[Type[CompiledNode], Type[ParsedResource]]
+CompiledResource = Union[ParsedResource, CompiledNode]
+
+
+def compiled_type_for(parsed: ParsedNode) -> CompiledType:
+    if type(parsed) in COMPILED_TYPES:
+        return COMPILED_TYPES[type(parsed)]
+    else:
+        return type(parsed)
+
+
+def parsed_instance_for(compiled: CompiledNode) -> ParsedResource:
+    cls = PARSED_TYPES.get(type(compiled))
+    if cls is None:
+        # how???
+        raise ValueError('invalid resource_type: {}'
+                         .format(compiled.resource_type))
+
+    # validate=False to allow extra keys from compiling
+    return cls.from_dict(compiled.to_dict(), validate=False)
+
+
+NonSourceCompiledNode = Union[
+    CompiledAnalysisNode,
+    CompiledDataTestNode,
+    CompiledModelNode,
+    CompiledHookNode,
+    CompiledRPCNode,
+    CompiledSchemaTestNode,
+    CompiledSeedNode,
+    CompiledSnapshotNode,
+]
+
+NonSourceParsedNode = Union[
+    ParsedAnalysisNode,
+    ParsedDataTestNode,
+    ParsedHookNode,
+    ParsedModelNode,
+    ParsedRPCNode,
+    ParsedSchemaTestNode,
+    ParsedSeedNode,
+    ParsedSnapshotNode,
+]
+
+
+# This is anything that can be in manifest.nodes.
+ManifestNode = Union[
+    NonSourceCompiledNode,
+    NonSourceParsedNode,
+]
+
+# We allow either parsed or compiled nodes, or parsed sources, as some
+# 'compile()' calls in the runner actually just return the original parsed
+# node they were given.
+CompileResultNode = Union[
+    ManifestNode,
+    ParsedSourceDefinition,
+]
+
+# anything that participates in the graph: sources, exposures, manifest nodes
+GraphMemberNode = Union[
+    CompileResultNode,
+    ParsedExposure,
+]

core/dbt/contracts/graph/model_config.py

@@ -0,0 +1,657 @@
+from dataclasses import field, Field, dataclass
+from enum import Enum
+from itertools import chain
+from typing import (
+    Any, List, Optional, Dict, MutableMapping, Union, Type, NewType, Tuple,
+    TypeVar, Callable, cast, Hashable
+)
+
+# TODO: patch+upgrade hologram to avoid this jsonschema import
+import jsonschema  # type: ignore
+
+# This is protected, but we really do want to reuse this logic, and the cache!
+# It would be nice to move the custom error picking stuff into hologram!
+from hologram import _validate_schema
+from hologram import JsonSchemaMixin, ValidationError
+from hologram.helpers import StrEnum, register_pattern
+
+from dbt.contracts.graph.unparsed import AdditionalPropertiesAllowed
+from dbt.exceptions import CompilationException, InternalException
+from dbt.contracts.util import Replaceable, list_str
+from dbt import hooks
+from dbt.node_types import NodeType
+
+
+M = TypeVar('M', bound='Metadata')
+
+
+def _get_meta_value(cls: Type[M], fld: Field, key: str, default: Any) -> M:
+    # a metadata field might exist. If it does, it might have a matching key.
+    # If it has both, make sure the value is valid and return it. If it
+    # doesn't, return the default.
+    if fld.metadata:
+        value = fld.metadata.get(key, default)
+    else:
+        value = default
+
+    try:
+        return cls(value)
+    except ValueError as exc:
+        raise InternalException(
+            f'Invalid {cls} value: {value}'
+        ) from exc
+
+
+def _set_meta_value(
+    obj: M, key: str, existing: Optional[Dict[str, Any]] = None
+) -> Dict[str, Any]:
+    if existing is None:
+        result = {}
+    else:
+        result = existing.copy()
+    result.update({key: obj})
+    return result
+
+
+class Metadata(Enum):
+    @classmethod
+    def from_field(cls: Type[M], fld: Field) -> M:
+        default = cls.default_field()
+        key = cls.metadata_key()
+
+        return _get_meta_value(cls, fld, key, default)
+
+    def meta(
+        self, existing: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
+        key = self.metadata_key()
+        return _set_meta_value(self, key, existing)
+
+    @classmethod
+    def default_field(cls) -> 'Metadata':
+        raise NotImplementedError('Not implemented')
+
+    @classmethod
+    def metadata_key(cls) -> str:
+        raise NotImplementedError('Not implemented')
+
+
+class MergeBehavior(Metadata):
+    Append = 1
+    Update = 2
+    Clobber = 3
+
+    @classmethod
+    def default_field(cls) -> 'MergeBehavior':
+        return cls.Clobber
+
+    @classmethod
+    def metadata_key(cls) -> str:
+        return 'merge'
+
+
+class ShowBehavior(Metadata):
+    Show = 1
+    Hide = 2
+
+    @classmethod
+    def default_field(cls) -> 'ShowBehavior':
+        return cls.Show
+
+    @classmethod
+    def metadata_key(cls) -> str:
+        return 'show_hide'
+
+    @classmethod
+    def should_show(cls, fld: Field) -> bool:
+        return cls.from_field(fld) == cls.Show
+
+
+class CompareBehavior(Metadata):
+    Include = 1
+    Exclude = 2
+
+    @classmethod
+    def default_field(cls) -> 'CompareBehavior':
+        return cls.Include
+
+    @classmethod
+    def metadata_key(cls) -> str:
+        return 'compare'
+
+    @classmethod
+    def should_include(cls, fld: Field) -> bool:
+        return cls.from_field(fld) == cls.Include
+
+
+def metas(*metas: Metadata) -> Dict[str, Any]:
+    existing: Dict[str, Any] = {}
+    for m in metas:
+        existing = m.meta(existing)
+    return existing
+
+
+def _listify(value: Any) -> List:
+    if isinstance(value, list):
+        return value[:]
+    else:
+        return [value]
+
+
+def _merge_field_value(
+    merge_behavior: MergeBehavior,
+    self_value: Any,
+    other_value: Any,
+):
+    if merge_behavior == MergeBehavior.Clobber:
+        return other_value
+    elif merge_behavior == MergeBehavior.Append:
+        return _listify(self_value) + _listify(other_value)
+    elif merge_behavior == MergeBehavior.Update:
+        if not isinstance(self_value, dict):
+            raise InternalException(f'expected dict, got {self_value}')
+        if not isinstance(other_value, dict):
+            raise InternalException(f'expected dict, got {other_value}')
+        value = self_value.copy()
+        value.update(other_value)
+        return value
+    else:
+        raise InternalException(
+            f'Got an invalid merge_behavior: {merge_behavior}'
+        )
+
+
+def insensitive_patterns(*patterns: str):
+    lowercased = []
+    for pattern in patterns:
+        lowercased.append(
+            ''.join('[{}{}]'.format(s.upper(), s.lower()) for s in pattern)
+        )
+    return '^({})$'.format('|'.join(lowercased))
+
+
+Severity = NewType('Severity', str)
+
+register_pattern(Severity, insensitive_patterns('warn', 'error'))
+
+
+class SnapshotStrategy(StrEnum):
+    Timestamp = 'timestamp'
+    Check = 'check'
+
+
+class All(StrEnum):
+    All = 'all'
+
+
+@dataclass
+class Hook(JsonSchemaMixin, Replaceable):
+    sql: str
+    transaction: bool = True
+    index: Optional[int] = None
+
+
+T = TypeVar('T', bound='BaseConfig')
+
+
+@dataclass
+class BaseConfig(
+    AdditionalPropertiesAllowed, Replaceable, MutableMapping[str, Any]
+):
+    # Implement MutableMapping so this config will behave as some macros expect
+    # during parsing (notably, syntax like `{{ node.config['schema'] }}`)
+    def __getitem__(self, key):
+        """Handle parse-time use of `config` as a dictionary, making the extra
+        values available during parsing.
+        """
+        if hasattr(self, key):
+            return getattr(self, key)
+        else:
+            return self._extra[key]
+
+    def __setitem__(self, key, value):
+        if hasattr(self, key):
+            setattr(self, key, value)
+        else:
+            self._extra[key] = value
+
+    def __delitem__(self, key):
+        if hasattr(self, key):
+            msg = (
+                'Error, tried to delete config key "{}": Cannot delete '
+                'built-in keys'
+            ).format(key)
+            raise CompilationException(msg)
+        else:
+            del self._extra[key]
+
+    def _content_iterator(self, include_condition: Callable[[Field], bool]):
+        seen = set()
+        for fld, _ in self._get_fields():
+            seen.add(fld.name)
+            if include_condition(fld):
+                yield fld.name
+
+        for key in self._extra:
+            if key not in seen:
+                seen.add(key)
+                yield key
+
+    def __iter__(self):
+        yield from self._content_iterator(include_condition=lambda f: True)
+
+    def __len__(self):
+        return len(self._get_fields()) + len(self._extra)
+
+    @staticmethod
+    def compare_key(
+        unrendered: Dict[str, Any],
+        other: Dict[str, Any],
+        key: str,
+    ) -> bool:
+        if key not in unrendered and key not in other:
+            return True
+        elif key not in unrendered and key in other:
+            return False
+        elif key in unrendered and key not in other:
+            return False
+        else:
+            return unrendered[key] == other[key]
+
+    @classmethod
+    def same_contents(
+        cls, unrendered: Dict[str, Any], other: Dict[str, Any]
+    ) -> bool:
+        """This is like __eq__, except it ignores some fields."""
+        seen = set()
+        for fld, target_name in cls._get_fields():
+            key = target_name
+            seen.add(key)
+            if CompareBehavior.should_include(fld):
+                if not cls.compare_key(unrendered, other, key):
+                    return False
+
+        for key in chain(unrendered, other):
+            if key not in seen:
+                seen.add(key)
+                if not cls.compare_key(unrendered, other, key):
+                    return False
+        return True
+
+    @classmethod
+    def _extract_dict(
+        cls, src: Dict[str, Any], data: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        """Find all the items in data that match a target_field on this class,
+        and merge them with the data found in `src` for target_field, using the
+        field's specified merge behavior. Matching items will be removed from
+        `data` (but _not_ `src`!).
+
+        Returns a dict with the merge results.
+
+        That means this method mutates its input! Any remaining values in data
+        were not merged.
+        """
+        result = {}
+
+        for fld, target_field in cls._get_fields():
+            if target_field not in data:
+                continue
+
+            data_attr = data.pop(target_field)
+            if target_field not in src:
+                result[target_field] = data_attr
+                continue
+
+            merge_behavior = MergeBehavior.from_field(fld)
+            self_attr = src[target_field]
+
+            result[target_field] = _merge_field_value(
+                merge_behavior=merge_behavior,
+                self_value=self_attr,
+                other_value=data_attr,
+            )
+        return result
+
+    def to_dict(
+        self,
+        omit_none: bool = True,
+        validate: bool = False,
+        *,
+        omit_hidden: bool = True,
+    ) -> Dict[str, Any]:
+        result = super().to_dict(omit_none=omit_none, validate=validate)
+        if omit_hidden and not omit_none:
+            for fld, target_field in self._get_fields():
+                if target_field not in result:
+                    continue
+
+                # if the field is not None, preserve it regardless of the
+                # setting. This is in line with existing behavior, but isn't
+                # an endorsement of it!
+                if result[target_field] is not None:
+                    continue
+
+                if not ShowBehavior.should_show(fld):
+                    del result[target_field]
+        return result
+
+    def update_from(
+        self: T, data: Dict[str, Any], adapter_type: str, validate: bool = True
+    ) -> T:
+        """Given a dict of keys, update the current config from them, validate
+        it, and return a new config with the updated values
+        """
+        # sadly, this is a circular import
+        from dbt.adapters.factory import get_config_class_by_name
+        dct = self.to_dict(omit_none=False, validate=False, omit_hidden=False)
+
+        adapter_config_cls = get_config_class_by_name(adapter_type)
+
+        self_merged = self._extract_dict(dct, data)
+        dct.update(self_merged)
+
+        adapter_merged = adapter_config_cls._extract_dict(dct, data)
+        dct.update(adapter_merged)
+
+        # any remaining fields must be "clobber"
+        dct.update(data)
+
+        # any validation failures must have come from the update
+        return self.from_dict(dct, validate=validate)
+
+    def finalize_and_validate(self: T) -> T:
+        # from_dict will validate for us
+        dct = self.to_dict(omit_none=False, validate=False)
+        return self.from_dict(dct)
+
+    def replace(self, **kwargs):
+        dct = self.to_dict(validate=False)
+
+        mapping = self.field_mapping()
+        for key, value in kwargs.items():
+            new_key = mapping.get(key, key)
+            dct[new_key] = value
+        return self.from_dict(dct, validate=False)
+
+
+@dataclass
+class SourceConfig(BaseConfig):
+    enabled: bool = True
+
+
+@dataclass
+class NodeConfig(BaseConfig):
+    enabled: bool = True
+    materialized: str = 'view'
+    persist_docs: Dict[str, Any] = field(default_factory=dict)
+    post_hook: List[Hook] = field(
+        default_factory=list,
+        metadata=MergeBehavior.Append.meta(),
+    )
+    pre_hook: List[Hook] = field(
+        default_factory=list,
+        metadata=MergeBehavior.Append.meta(),
+    )
+    # this only applies for config v1, so it doesn't participate in comparison
+    vars: Dict[str, Any] = field(
+        default_factory=dict,
+        metadata=metas(CompareBehavior.Exclude, MergeBehavior.Update),
+    )
+    quoting: Dict[str, Any] = field(
+        default_factory=dict,
+        metadata=MergeBehavior.Update.meta(),
+    )
+    # This is actually only used by seeds. Should it be available to others?
+    # That would be a breaking change!
+    column_types: Dict[str, Any] = field(
+        default_factory=dict,
+        metadata=MergeBehavior.Update.meta(),
+    )
+    # these fields are included in serialized output, but are not part of
+    # config comparison (they are part of database_representation)
+    alias: Optional[str] = field(
+        default=None,
+        metadata=CompareBehavior.Exclude.meta(),
+    )
+    schema: Optional[str] = field(
+        default=None,
+        metadata=CompareBehavior.Exclude.meta(),
+    )
+    database: Optional[str] = field(
+        default=None,
+        metadata=CompareBehavior.Exclude.meta(),
+    )
+    tags: Union[List[str], str] = field(
+        default_factory=list_str,
+        metadata=metas(ShowBehavior.Hide,
+                       MergeBehavior.Append,
+                       CompareBehavior.Exclude),
+    )
+    full_refresh: Optional[bool] = None
+
+    @classmethod
+    def from_dict(cls, data, validate=True):
+        for key in hooks.ModelHookType:
+            if key in data:
+                data[key] = [hooks.get_hook_dict(h) for h in data[key]]
+        return super().from_dict(data, validate=validate)
+
+    @classmethod
+    def field_mapping(cls):
+        return {'post_hook': 'post-hook', 'pre_hook': 'pre-hook'}
+
+
+@dataclass
+class SeedConfig(NodeConfig):
+    materialized: str = 'seed'
+    quote_columns: Optional[bool] = None
+
+
+@dataclass
+class TestConfig(NodeConfig):
+    materialized: str = 'test'
+    severity: Severity = Severity('ERROR')
+
+
+SnapshotVariants = Union[
+    'TimestampSnapshotConfig',
+    'CheckSnapshotConfig',
+    'GenericSnapshotConfig',
+]
+
+
+def _relevance_without_strategy(error: jsonschema.ValidationError):
+    # calculate the 'relevance' of an error the normal jsonschema way, except
+    # if the validator is in the 'strategy' field and its conflicting with the
+    # 'enum'. This suppresses `"'timestamp' is not one of ['check']` and such
+    if 'strategy' in error.path and error.validator in {'enum', 'not'}:
+        length = 1
+    else:
+        length = -len(error.path)
+    validator = error.validator
+    return length, validator not in {'anyOf', 'oneOf'}
+
+
+@dataclass
+class SnapshotWrapper(JsonSchemaMixin):
+    """This is a little wrapper to let us serialize/deserialize the
+    SnapshotVariants union.
+    """
+    config: SnapshotVariants  # mypy: ignore
+
+    @classmethod
+    def validate(cls, data: Any):
+        config = data.get('config', {})
+
+        if config.get('strategy') == 'check':
+            schema = _validate_schema(CheckSnapshotConfig)
+            to_validate = config
+
+        elif config.get('strategy') == 'timestamp':
+            schema = _validate_schema(TimestampSnapshotConfig)
+            to_validate = config
+
+        else:
+            h_cls = cast(Hashable, cls)
+            schema = _validate_schema(h_cls)
+            to_validate = data
+
+        validator = jsonschema.Draft7Validator(schema)
+
+        error = jsonschema.exceptions.best_match(
+            validator.iter_errors(to_validate),
+            key=_relevance_without_strategy,
+        )
+
+        if error is not None:
+            raise ValidationError.create_from(error) from error
+
+
+@dataclass
+class EmptySnapshotConfig(NodeConfig):
+    materialized: str = 'snapshot'
+
+
+@dataclass(init=False)
+class SnapshotConfig(EmptySnapshotConfig):
+    unique_key: str = field(init=False, metadata=dict(init_required=True))
+    target_schema: str = field(init=False, metadata=dict(init_required=True))
+    target_database: Optional[str] = None
+
+    def __init__(
+        self,
+        unique_key: str,
+        target_schema: str,
+        target_database: Optional[str] = None,
+        **kwargs
+    ) -> None:
+        self.unique_key = unique_key
+        self.target_schema = target_schema
+        self.target_database = target_database
+        # kwargs['materialized'] = materialized
+        super().__init__(**kwargs)
+
+    # type hacks...
+    @classmethod
+    def _get_fields(cls) -> List[Tuple[Field, str]]:  # type: ignore
+        fields: List[Tuple[Field, str]] = []
+        for old_field, name in super()._get_fields():
+            new_field = old_field
+            # tell hologram we're really an initvar
+            if old_field.metadata and old_field.metadata.get('init_required'):
+                new_field = field(init=True, metadata=old_field.metadata)
+                new_field.name = old_field.name
+                new_field.type = old_field.type
+                new_field._field_type = old_field._field_type  # type: ignore
+            fields.append((new_field, name))
+        return fields
+
+    def finalize_and_validate(self: 'SnapshotConfig') -> SnapshotVariants:
+        data = self.to_dict()
+        return SnapshotWrapper.from_dict({'config': data}).config
+
+
+@dataclass(init=False)
+class GenericSnapshotConfig(SnapshotConfig):
+    strategy: str = field(init=False, metadata=dict(init_required=True))
+
+    def __init__(self, strategy: str, **kwargs) -> None:
+        self.strategy = strategy
+        super().__init__(**kwargs)
+
+    @classmethod
+    def _collect_json_schema(
+        cls, definitions: Dict[str, Any]
+    ) -> Dict[str, Any]:
+        # this is the method you want to override in hologram if you want
+        # to do clever things about the json schema and have classes that
+        # contain instances of your JsonSchemaMixin respect the change.
+        schema = super()._collect_json_schema(definitions)
+
+        # Instead of just the strategy we'd calculate normally, say
+        # "this strategy except none of our specialization strategies".
+        strategies = [schema['properties']['strategy']]
+        for specialization in (TimestampSnapshotConfig, CheckSnapshotConfig):
+            strategies.append(
+                {'not': specialization.json_schema()['properties']['strategy']}
+            )
+
+        schema['properties']['strategy'] = {
+            'allOf': strategies
+        }
+        return schema
+
+
+@dataclass(init=False)
+class TimestampSnapshotConfig(SnapshotConfig):
+    strategy: str = field(
+        init=False,
+        metadata=dict(
+            restrict=[str(SnapshotStrategy.Timestamp)],
+            init_required=True,
+        ),
+    )
+    updated_at: str = field(init=False, metadata=dict(init_required=True))
+
+    def __init__(
+        self, strategy: str, updated_at: str, **kwargs
+    ) -> None:
+        self.strategy = strategy
+        self.updated_at = updated_at
+        super().__init__(**kwargs)
+
+
+@dataclass(init=False)
+class CheckSnapshotConfig(SnapshotConfig):
+    strategy: str = field(
+        init=False,
+        metadata=dict(
+            restrict=[str(SnapshotStrategy.Check)],
+            init_required=True,
+        ),
+    )
+    # TODO: is there a way to get this to accept tuples of strings? Adding
+    # `Tuple[str, ...]` to the list of types results in this:
+    # ['email'] is valid under each of {'type': 'array', 'items':
+    # {'type': 'string'}}, {'type': 'array', 'items': {'type': 'string'}}
+    # but without it, parsing gets upset about values like `('email',)`
+    # maybe hologram itself should support this behavior? It's not like tuples
+    # are meaningful in json
+    check_cols: Union[All, List[str]] = field(
+        init=False,
+        metadata=dict(init_required=True),
+    )
+
+    def __init__(
+        self, strategy: str, check_cols: Union[All, List[str]],
+        **kwargs
+    ) -> None:
+        self.strategy = strategy
+        self.check_cols = check_cols
+        super().__init__(**kwargs)
+
+
+RESOURCE_TYPES: Dict[NodeType, Type[BaseConfig]] = {
+    NodeType.Source: SourceConfig,
+    NodeType.Seed: SeedConfig,
+    NodeType.Test: TestConfig,
+    NodeType.Model: NodeConfig,
+    NodeType.Snapshot: SnapshotConfig,
+}
+
+
+# base resource types are like resource types, except nothing has mandatory
+# configs.
+BASE_RESOURCE_TYPES: Dict[NodeType, Type[BaseConfig]] = RESOURCE_TYPES.copy()
+BASE_RESOURCE_TYPES.update({
+    NodeType.Snapshot: EmptySnapshotConfig
+})
+
+
+def get_config_for(resource_type: NodeType, base=False) -> Type[BaseConfig]:
+    if base:
+        lookup = BASE_RESOURCE_TYPES
+    else:
+        lookup = RESOURCE_TYPES
+    return lookup.get(resource_type, NodeConfig)

core/dbt/contracts/graph/unparsed.py

@@ -1,389 +1,416 @@
-from dbt.api import APIObject
-
 from dbt.node_types import NodeType
-from dbt.utils import deep_merge
-
-
-UNPARSED_BASE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'package_name': {
-            'type': 'string',
-        },
-        # filesystem
-        'root_path': {
-            'type': 'string',
-            'description': 'The absolute path to the project root',
-        },
-        'path': {
-            'type': 'string',
-            'description': (
-                'Relative path to the source file from the project root. '
-                'Usually the same as original_file_path, but in some cases '
-                'dbt will generate a path.'),
-        },
-        'original_file_path': {
-            'type': 'string',
-            'description': (
-                'Relative path to the originating file from the project root.'
-            ),
-        }
-    },
-    'required': ['package_name', 'root_path', 'path', 'original_file_path']
-}
-
-UNPARSED_HAS_SQL_CONTRACT = {
-    'properties': {
-        'raw_sql': {
-            'type': 'string',
-            'description': (
-                'For nodes defined in SQL files, this is just the contents '
-                'of that file. For schema tests, snapshots, etc. this is '
-                'generated by dbt.'),
-        },
-        'index': {
-            'type': 'integer',
-        }
-    },
-    'required': ['raw_sql']
-}
-
-UNPARSED_MACRO_CONTRACT = deep_merge(
-    UNPARSED_BASE_CONTRACT,
-    UNPARSED_HAS_SQL_CONTRACT
+from dbt.contracts.util import (
+    AdditionalPropertiesMixin,
+    Mergeable,
+    Replaceable,
 )
+# trigger the PathEncoder
+import dbt.helper_types  # noqa:F401
+from dbt.exceptions import CompilationException
 
-UNPARSED_NODE_CONTRACT = deep_merge(
-    UNPARSED_BASE_CONTRACT,
-    UNPARSED_HAS_SQL_CONTRACT,
-    {
-        'properties': {
-            'name': {
-                'type': 'string',
-                'description': (
-                    'Name of this node. For models, this is used as the '
-                    'identifier in the database.'),
-                'minLength': 1,
-            },
-            'resource_type': {
-                'enum': [
-                    NodeType.Model,
-                    NodeType.Test,
-                    NodeType.Analysis,
-                    NodeType.Operation,
-                    NodeType.Seed,
-                    # we need this if parse_node is going to handle snapshots.
-                    NodeType.Snapshot,
-                    NodeType.RPCCall,
-                ]
-            },
-        },
-        'required': ['resource_type', 'name']
-    }
-)
+from hologram import JsonSchemaMixin
+from hologram.helpers import StrEnum, ExtensibleJsonSchemaMixin
+
+from dataclasses import dataclass, field
+from datetime import timedelta
+from pathlib import Path
+from typing import Optional, List, Union, Dict, Any, Sequence
 
 
-class UnparsedMacro(APIObject):
-    SCHEMA = UNPARSED_MACRO_CONTRACT
+@dataclass
+class UnparsedBaseNode(JsonSchemaMixin, Replaceable):
+    package_name: str
+    root_path: str
+    path: str
+    original_file_path: str
 
 
-class UnparsedNode(APIObject):
-    SCHEMA = UNPARSED_NODE_CONTRACT
-
-
-COLUMN_TEST_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'name': {
-            'type': 'string',
-            'description': 'The name of the column this test is for',
-        },
-        'description': {
-            'type': 'string',
-            'description': 'The description of this test',
-        },
-        'tests': {
-            'type': 'array',
-            'items': {
-                "anyOf": [
-                    # 'not_null', 'unique', ...
-                    {'type': 'string'},
-                    # 'relationships: {...}', 'accepted_values: {...}'
-                    {'type': 'object', 'additionalProperties': True}
-                ],
-            },
-            'description': 'The list of tests to perform',
-        },
-    },
-    'required': ['name'],
-}
-
-
-UNPARSED_COLUMN_DESCRIPTION_CONTRACT = {
-    'properties': {
-        'columns': {
-            'type': 'array',
-            'items': COLUMN_TEST_CONTRACT,
-        },
-    },
-}
-
-
-UNPARSED_NODE_DESCRIPTION_CONTRACT = {
-    'properties': {
-        'name': {
-            'type': 'string',
-            'description': (
-                'The name of this node, which is the name of the model it'
-                'refers to'
-            ),
-            'minLength': 1,
-        },
-        'description': {
-            'type': 'string',
-            'description': (
-                'The raw string description of the node after parsing the yaml'
-            ),
-        },
-        'tests': {
-            'type': 'array',
-            'items': {
-                "anyOf": [
-                    {'type': 'string'},
-                    {'type': 'object', 'additionalProperties': True}
-                ],
-            },
-        },
-    },
-    'required': ['name'],
-}
-
-
-UNPARSED_NODE_UPDATE_CONTRACT = deep_merge(
-    UNPARSED_NODE_DESCRIPTION_CONTRACT,
-    UNPARSED_COLUMN_DESCRIPTION_CONTRACT,
-    {
-        'type': 'object',
-        'additionalProperties': False,
-        'description': (
-            'A collection of the unparsed node updates, as provided in the '
-            '"models" section of schema.yml'
-        ),
-    }
-)
-
-
-class UnparsedNodeUpdate(APIObject):
-    """An unparsed node update is the blueprint for tests to be added and nodes
-    to be updated, referencing a certain node (specifically, a Model or
-    Source).
-    """
-    SCHEMA = UNPARSED_NODE_UPDATE_CONTRACT
-
-
-TIME_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'count': {
-            'type': 'integer',
-        },
-        'period': {
-            'enum': ['minute', 'hour', 'day'],
-        },
-    },
-    'required': ['count', 'period'],
-}
-
-
-_FRESHNESS_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'warn_after': {
-            'anyOf': [
-                {'type': 'null'},
-                TIME_CONTRACT,
-            ]
-        },
-        'error_after': {
-            'anyOf': [
-                {'type': 'null'},
-                TIME_CONTRACT,
-
-            ]
-        },
-    },
-}
-
-
-_QUOTING_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'database': {'type': 'boolean'},
-        'schema': {'type': 'boolean'},
-        'identifier': {'type': 'boolean'},
-    },
-}
-
-
-QUOTING_CONTRACT = {
-    'properties': {
-        'quoting': {
-            'anyOf': [
-                {'type': 'null'},
-                _QUOTING_CONTRACT,
-            ],
-        },
-    },
-}
-
-
-FRESHNESS_CONTRACT = {
-    'properties': {
-        'loaded_at_field': {
-            'type': ['null', 'string'],
-            'description': 'The field to use as the "loaded at" timestamp',
-        },
-        'freshness': {
-            'anyOf': [
-                {'type': 'null'},
-                _FRESHNESS_CONTRACT,
-            ],
-        },
-    },
-}
-
-
-UNPARSED_SOURCE_TABLE_DEFINITION_CONTRACT = deep_merge(
-    UNPARSED_NODE_DESCRIPTION_CONTRACT,
-    UNPARSED_COLUMN_DESCRIPTION_CONTRACT,
-    FRESHNESS_CONTRACT,
-    QUOTING_CONTRACT,
-    {
-        'description': (
-            'A source table definition, as provided in the "tables" '
-            'subsection of the "sources" section of schema.yml'
-        ),
-        'properties': {
-            'identifier': {
-                'type': 'string',
-                'description': 'The identifier for the source table',
-                'minLength': 1,
-            },
-        },
-    }
-)
-
-
-UNPARSED_SOURCE_DEFINITION_CONTRACT = deep_merge(
-    FRESHNESS_CONTRACT,
-    QUOTING_CONTRACT,
-    {
-        'type': 'object',
-        'additionalProperties': False,
-        'description': (
-            'A collection of the unparsed sources, as provided in the '
-            '"sources" section of schema.yml'
-        ),
-        'properties': {
-            'name': {
-                'type': 'string',
-                'description': 'The reference name of the source definition',
-                'minLength': 1,
-            },
-            'loader': {
-                'type': 'string',
-                'description': 'The user-defined loader for this source',
-                'minLength': 1,
-            },
-            'description': {
-                'type': 'string',
-                'description': 'The user-supplied description of the source',
-            },
-            'database': {
-                'type': 'string',
-                'description': 'The database name for the source table',
-                'minLength': 1,
-            },
-            'schema': {
-                'type': 'string',
-                'description': 'The schema name for the source table',
-                'minLength': 1,
-            },
-            'tables': {
-                'type': 'array',
-                'items': UNPARSED_SOURCE_TABLE_DEFINITION_CONTRACT,
-                'description': 'The tables for this source',
-                'minLength': 1,
-            },
-        },
-        'required': ['name'],
-    }
-)
-
-
-class UnparsedTableDefinition(APIObject):
-    SCHEMA = UNPARSED_SOURCE_TABLE_DEFINITION_CONTRACT
-
-
-class UnparsedSourceDefinition(APIObject):
-    SCHEMA = UNPARSED_SOURCE_DEFINITION_CONTRACT
+@dataclass
+class HasSQL:
+    raw_sql: str
 
     @property
-    def tables(self):
-        return [UnparsedTableDefinition(**t) for t in self.get('tables', [])]
+    def empty(self):
+        return not self.raw_sql.strip()
 
 
-UNPARSED_DOCUMENTATION_FILE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'package_name': {
-            'type': 'string',
-        },
-        # filesystem
-        'root_path': {
-            'type': 'string',
-            'description': 'The absolute path to the project root',
-        },
-        'path': {
-            'type': 'string',
-            'description': (
-                'Relative path to the source file from the project root. '
-                'Usually the same as original_file_path, but in some cases '
-                'dbt will generate a path.'),
-        },
-        'original_file_path': {
-            'type': 'string',
-            'description': (
-                'Relative path to the originating file from the project root.'
-            ),
-        },
-        'file_contents': {
-            'type': 'string',
-            'description': (
-                'The raw text provided in the documentation block, presumably '
-                'markdown.'
-            ),
-        },
-        # TODO: I would like to remove this, but some graph error handling
-        # cares about it.
-        'resource_type': {
-            'enum': [
-                NodeType.Documentation,
-            ]
-        },
-    },
-    'required': [
-        'package_name', 'root_path', 'path', 'original_file_path',
-        'file_contents', 'resource_type'
-    ],
-}
+@dataclass
+class UnparsedMacro(UnparsedBaseNode, HasSQL):
+    resource_type: NodeType = field(metadata={'restrict': [NodeType.Macro]})
 
 
-class UnparsedDocumentationFile(APIObject):
-    SCHEMA = UNPARSED_DOCUMENTATION_FILE_CONTRACT
+@dataclass
+class UnparsedNode(UnparsedBaseNode, HasSQL):
+    name: str
+    resource_type: NodeType = field(metadata={'restrict': [
+        NodeType.Model,
+        NodeType.Analysis,
+        NodeType.Test,
+        NodeType.Snapshot,
+        NodeType.Operation,
+        NodeType.Seed,
+        NodeType.RPCCall,
+    ]})
+
+    @property
+    def search_name(self):
+        return self.name
+
+
+@dataclass
+class UnparsedRunHook(UnparsedNode):
+    resource_type: NodeType = field(
+        metadata={'restrict': [NodeType.Operation]}
+    )
+    index: Optional[int] = None
+
+
+@dataclass
+class Docs(JsonSchemaMixin, Replaceable):
+    show: bool = True
+
+
+@dataclass
+class HasDocs(AdditionalPropertiesMixin, ExtensibleJsonSchemaMixin,
+              Replaceable):
+    name: str
+    description: str = ''
+    meta: Dict[str, Any] = field(default_factory=dict)
+    data_type: Optional[str] = None
+    docs: Docs = field(default_factory=Docs)
+    _extra: Dict[str, Any] = field(default_factory=dict)
+
+
+TestDef = Union[Dict[str, Any], str]
+
+
+@dataclass
+class HasTests(HasDocs):
+    tests: Optional[List[TestDef]] = None
+
+    def __post_init__(self):
+        if self.tests is None:
+            self.tests = []
+
+
+@dataclass
+class UnparsedColumn(HasTests):
+    quote: Optional[bool] = None
+    tags: List[str] = field(default_factory=list)
+
+
+@dataclass
+class HasColumnDocs(JsonSchemaMixin, Replaceable):
+    columns: Sequence[HasDocs] = field(default_factory=list)
+
+
+@dataclass
+class HasColumnTests(HasColumnDocs):
+    columns: Sequence[UnparsedColumn] = field(default_factory=list)
+
+
+@dataclass
+class HasYamlMetadata(JsonSchemaMixin):
+    original_file_path: str
+    yaml_key: str
+    package_name: str
+
+
+@dataclass
+class UnparsedAnalysisUpdate(HasColumnDocs, HasDocs, HasYamlMetadata):
+    pass
+
+
+@dataclass
+class UnparsedNodeUpdate(HasColumnTests, HasTests, HasYamlMetadata):
+    quote_columns: Optional[bool] = None
+
+
+@dataclass
+class MacroArgument(JsonSchemaMixin):
+    name: str
+    type: Optional[str] = None
+    description: str = ''
+
+
+@dataclass
+class UnparsedMacroUpdate(HasDocs, HasYamlMetadata):
+    arguments: List[MacroArgument] = field(default_factory=list)
+
+
+class TimePeriod(StrEnum):
+    minute = 'minute'
+    hour = 'hour'
+    day = 'day'
+
+    def plural(self) -> str:
+        return str(self) + 's'
+
+
+@dataclass
+class Time(JsonSchemaMixin, Replaceable):
+    count: int
+    period: TimePeriod
+
+    def exceeded(self, actual_age: float) -> bool:
+        kwargs = {self.period.plural(): self.count}
+        difference = timedelta(**kwargs).total_seconds()
+        return actual_age > difference
+
+
+@dataclass
+class FreshnessThreshold(JsonSchemaMixin, Mergeable):
+    warn_after: Optional[Time] = None
+    error_after: Optional[Time] = None
+    filter: Optional[str] = None
+
+    def status(self, age: float) -> "dbt.contracts.results.FreshnessStatus":
+        from dbt.contracts.results import FreshnessStatus
+        if self.error_after and self.error_after.exceeded(age):
+            return FreshnessStatus.Error
+        elif self.warn_after and self.warn_after.exceeded(age):
+            return FreshnessStatus.Warn
+        else:
+            return FreshnessStatus.Pass
+
+    def __bool__(self):
+        return self.warn_after is not None or self.error_after is not None
+
+
+@dataclass
+class AdditionalPropertiesAllowed(
+    AdditionalPropertiesMixin,
+    ExtensibleJsonSchemaMixin
+):
+    _extra: Dict[str, Any] = field(default_factory=dict)
+
+
+@dataclass
+class ExternalPartition(AdditionalPropertiesAllowed, Replaceable):
+    name: str = ''
+    description: str = ''
+    data_type: str = ''
+    meta: Dict[str, Any] = field(default_factory=dict)
+
+    def __post_init__(self):
+        if self.name == '' or self.data_type == '':
+            raise CompilationException(
+                'External partition columns must have names and data types'
+            )
+
+
+@dataclass
+class ExternalTable(AdditionalPropertiesAllowed, Mergeable):
+    location: Optional[str] = None
+    file_format: Optional[str] = None
+    row_format: Optional[str] = None
+    tbl_properties: Optional[str] = None
+    partitions: Optional[List[ExternalPartition]] = None
+
+    def __bool__(self):
+        return self.location is not None
+
+
+@dataclass
+class Quoting(JsonSchemaMixin, Mergeable):
+    database: Optional[bool] = None
+    schema: Optional[bool] = None
+    identifier: Optional[bool] = None
+    column: Optional[bool] = None
+
+
+@dataclass
+class UnparsedSourceTableDefinition(HasColumnTests, HasTests):
+    loaded_at_field: Optional[str] = None
+    identifier: Optional[str] = None
+    quoting: Quoting = field(default_factory=Quoting)
+    freshness: Optional[FreshnessThreshold] = field(
+        default_factory=FreshnessThreshold
+    )
+    external: Optional[ExternalTable] = None
+    tags: List[str] = field(default_factory=list)
+
+    def to_dict(self, omit_none=True, validate=False):
+        result = super().to_dict(omit_none=omit_none, validate=validate)
+        if omit_none and self.freshness is None:
+            result['freshness'] = None
+        return result
+
+
+@dataclass
+class UnparsedSourceDefinition(JsonSchemaMixin, Replaceable):
+    name: str
+    description: str = ''
+    meta: Dict[str, Any] = field(default_factory=dict)
+    database: Optional[str] = None
+    schema: Optional[str] = None
+    loader: str = ''
+    quoting: Quoting = field(default_factory=Quoting)
+    freshness: Optional[FreshnessThreshold] = field(
+        default_factory=FreshnessThreshold
+    )
+    loaded_at_field: Optional[str] = None
+    tables: List[UnparsedSourceTableDefinition] = field(default_factory=list)
+    tags: List[str] = field(default_factory=list)
+
+    @property
+    def yaml_key(self) -> 'str':
+        return 'sources'
+
+    def to_dict(self, omit_none=True, validate=False):
+        result = super().to_dict(omit_none=omit_none, validate=validate)
+        if omit_none and self.freshness is None:
+            result['freshness'] = None
+        return result
+
+
+@dataclass
+class SourceTablePatch(JsonSchemaMixin):
+    name: str
+    description: Optional[str] = None
+    meta: Optional[Dict[str, Any]] = None
+    data_type: Optional[str] = None
+    docs: Optional[Docs] = None
+    loaded_at_field: Optional[str] = None
+    identifier: Optional[str] = None
+    quoting: Quoting = field(default_factory=Quoting)
+    freshness: Optional[FreshnessThreshold] = field(
+        default_factory=FreshnessThreshold
+    )
+    external: Optional[ExternalTable] = None
+    tags: Optional[List[str]] = None
+    tests: Optional[List[TestDef]] = None
+    columns: Optional[Sequence[UnparsedColumn]] = None
+
+    def to_patch_dict(self) -> Dict[str, Any]:
+        dct = self.to_dict(omit_none=True)
+        remove_keys = ('name')
+        for key in remove_keys:
+            if key in dct:
+                del dct[key]
+
+        if self.freshness is None:
+            dct['freshness'] = None
+
+        return dct
+
+
+@dataclass
+class SourcePatch(JsonSchemaMixin, Replaceable):
+    name: str = field(
+        metadata=dict(description='The name of the source to override'),
+    )
+    overrides: str = field(
+        metadata=dict(description='The package of the source to override'),
+    )
+    path: Path = field(
+        metadata=dict(description='The path to the patch-defining yml file'),
+    )
+    description: Optional[str] = None
+    meta: Optional[Dict[str, Any]] = None
+    database: Optional[str] = None
+    schema: Optional[str] = None
+    loader: Optional[str] = None
+    quoting: Optional[Quoting] = None
+    freshness: Optional[Optional[FreshnessThreshold]] = field(
+        default_factory=FreshnessThreshold
+    )
+    loaded_at_field: Optional[str] = None
+    tables: Optional[List[SourceTablePatch]] = None
+    tags: Optional[List[str]] = None
+
+    def to_patch_dict(self) -> Dict[str, Any]:
+        dct = self.to_dict(omit_none=True)
+        remove_keys = ('name', 'overrides', 'tables', 'path')
+        for key in remove_keys:
+            if key in dct:
+                del dct[key]
+
+        if self.freshness is None:
+            dct['freshness'] = None
+
+        return dct
+
+    def get_table_named(self, name: str) -> Optional[SourceTablePatch]:
+        if self.tables is not None:
+            for table in self.tables:
+                if table.name == name:
+                    return table
+        return None
+
+
+@dataclass
+class UnparsedDocumentation(JsonSchemaMixin, Replaceable):
+    package_name: str
+    root_path: str
+    path: str
+    original_file_path: str
+
+    @property
+    def resource_type(self):
+        return NodeType.Documentation
+
+
+@dataclass
+class UnparsedDocumentationFile(UnparsedDocumentation):
+    file_contents: str
+
+
+# can't use total_ordering decorator here, as str provides an ordering already
+# and it's not the one we want.
+class Maturity(StrEnum):
+    low = 'low'
+    medium = 'medium'
+    high = 'high'
+
+    def __lt__(self, other):
+        if not isinstance(other, Maturity):
+            return NotImplemented
+        order = (Maturity.low, Maturity.medium, Maturity.high)
+        return order.index(self) < order.index(other)
+
+    def __gt__(self, other):
+        if not isinstance(other, Maturity):
+            return NotImplemented
+        return self != other and not (self < other)
+
+    def __ge__(self, other):
+        if not isinstance(other, Maturity):
+            return NotImplemented
+        return self == other or not (self < other)
+
+    def __le__(self, other):
+        if not isinstance(other, Maturity):
+            return NotImplemented
+        return self == other or self < other
+
+
+class ExposureType(StrEnum):
+    Dashboard = 'dashboard'
+    Notebook = 'notebook'
+    Analysis = 'analysis'
+    ML = 'ml'
+    Application = 'application'
+
+
+class MaturityType(StrEnum):
+    Low = 'low'
+    Medium = 'medium'
+    High = 'high'
+
+
+@dataclass
+class ExposureOwner(JsonSchemaMixin, Replaceable):
+    email: str
+    name: Optional[str] = None
+
+
+@dataclass
+class UnparsedExposure(JsonSchemaMixin, Replaceable):
+    name: str
+    type: ExposureType
+    owner: ExposureOwner
+    description: str = ''
+    maturity: Optional[MaturityType] = None
+    url: Optional[str] = None
+    depends_on: List[str] = field(default_factory=list)

core/dbt/contracts/project.py

@@ -1,400 +1,253 @@
-from dbt.api.object import APIObject
+from dbt.contracts.util import Replaceable, Mergeable, list_str
+from dbt.contracts.connection import UserConfigContract, QueryComment
+from dbt.helper_types import NoValue
 from dbt.logger import GLOBAL_LOGGER as logger  # noqa
-from dbt.utils import deep_merge
+from dbt import tracking
+from dbt import ui
+
+from hologram import JsonSchemaMixin, ValidationError
+from hologram.helpers import HyphenatedJsonSchemaMixin, register_pattern, \
+    ExtensibleJsonSchemaMixin
+
+from dataclasses import dataclass, field
+from typing import Optional, List, Dict, Union, Any, NewType
+
+PIN_PACKAGE_URL = 'https://docs.getdbt.com/docs/package-management#section-specifying-package-versions'  # noqa
+DEFAULT_SEND_ANONYMOUS_USAGE_STATS = True
 
 
-ARCHIVE_TABLE_CONFIG_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'source_table': {'type': 'string'},
-        'target_table': {'type': 'string'},
-        'updated_at': {'type': 'string'},
-        'unique_key': {'type': 'string'},
-    },
-    'required': ['source_table', 'target_table', 'updated_at', 'unique_key'],
-}
+Name = NewType('Name', str)
+register_pattern(Name, r'^[^\d\W]\w*$')
 
-
-ARCHIVE_CONFIG_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'source_database': {'type': 'string'},
-        'target_database': {'type': 'string'},
-        'source_schema': {'type': 'string'},
-        'target_schema': {'type': 'string'},
-        'tables': {
-            'type': 'array',
-            'items': ARCHIVE_TABLE_CONFIG_CONTRACT,
-        }
-    },
-    'required': ['source_schema', 'target_schema', 'tables'],
-}
-
-
-PROJECT_CONTRACT = {
-    'type': 'object',
-    'description': 'The project configuration.',
-    'additionalProperties': False,
-    'properties': {
-        'name': {
-            'type': 'string',
-            'pattern': r'^[^\d\W]\w*\Z',
-        },
-        'version': {
-            'anyOf': [
-                {
-                    'type': 'string',
-                    'pattern': (
-                        # this does not support the full semver (does not
-                        # allow a trailing -fooXYZ) and is not restrictive
-                        # enough for full semver, (allows '1.0'). But it's like
-                        # 'semver lite'.
-                        r'^(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(\.(?:0|[1-9]\d*))?$'
-                    ),
-                },
-                {
-                    # the internal global_project/dbt_project.yml is actually
-                    # 1.0. Heaven only knows how many users have done the same
-                    'type': 'number',
-                },
-            ],
-        },
-        'project-root': {
-            'type': 'string',
-        },
-        'source-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'macro-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'data-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'test-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'analysis-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'docs-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'target-path': {
-            'type': 'string',
-        },
-        'snapshot-paths': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'clean-targets': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'profile': {
-            'type': ['null', 'string'],
-        },
-        'log-path': {
-            'type': 'string',
-        },
-        'modules-path': {
-            'type': 'string',
-        },
-        'quoting': {
-            'type': 'object',
-            'additionalProperties': False,
-            'properties': {
-                'identifier': {
-                    'type': 'boolean',
-                },
-                'schema': {
-                    'type': 'boolean',
-                },
-                'database': {
-                    'type': 'boolean',
-                },
-                'project': {
-                    'type': 'boolean',
-                }
-            },
-        },
-        'models': {
-            'type': 'object',
-            'additionalProperties': True,
-        },
-        'on-run-start': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'on-run-end': {
-            'type': 'array',
-            'items': {'type': 'string'},
-        },
-        'archive': {
-            'type': 'array',
-            'items': ARCHIVE_CONFIG_CONTRACT,
-        },
-        'seeds': {
-            'type': 'object',
-            'additionalProperties': True,
-        },
-        # we validate the regex separately, using the pattern in dbt.semver
-        'require-dbt-version': {
-            'type': ['string', 'array'],
-            'items': {'type': 'string'},
-        },
-    },
-    'required': ['name', 'version'],
-}
-
-
-class Project(APIObject):
-    SCHEMA = PROJECT_CONTRACT
-
-
-LOCAL_PACKAGE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'local': {
-            'type': 'string',
-            'description': 'The absolute path to the local package.',
-        },
-        'required': ['local'],
-    },
-}
-
-
-GIT_PACKAGE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'git': {
-            'type': 'string',
-            'description': (
-                'The URL to the git repository that stores the pacakge'
-            ),
-        },
-        'revision': {
-            'type': ['string', 'array'],
-            'items': {'type': 'string'},
-            'description': 'The git revision to use, if it is not tip',
-        },
-        'warn-unpinned': {
-            'type': 'boolean',
-        }
-    },
-    'required': ['git'],
-}
-
-
-VERSION_SPECIFICATION_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'major': {
-            'type': ['string', 'null'],
-        },
-        'minor': {
-            'type': ['string', 'null'],
-        },
-        'patch': {
-            'type': ['string', 'null'],
-        },
-        'prerelease': {
-            'type': ['string', 'null'],
-        },
-        'build': {
-            'type': ['string', 'null'],
-        },
-        'matcher': {
-            'type': 'string',
-            'enum': ['=', '>=', '<=', '>', '<'],
-        },
-    },
-    'required': ['major', 'minor', 'patch', 'prerelease', 'build', 'matcher'],
-}
-
-
-REGISTRY_PACKAGE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'package': {
-            'type': 'string',
-            'description': 'The name of the package',
-        },
-        'version': {
-            'type': ['string', 'array'],
-            'items': {
-                'anyOf': [
-                    VERSION_SPECIFICATION_CONTRACT,
-                    {'type': 'string'}
-                ],
-            },
-            'description': 'The version of the package',
-        },
-    },
-    'required': ['package', 'version'],
-}
-
-
-PACKAGE_FILE_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'packages': {
-            'type': 'array',
-            'items': {
-                'anyOf': [
-                    LOCAL_PACKAGE_CONTRACT,
-                    GIT_PACKAGE_CONTRACT,
-                    REGISTRY_PACKAGE_CONTRACT,
-                ],
-            },
-        },
-    },
-    'required': ['packages'],
-}
-
-
-# the metadata from the registry has extra things that we don't care about.
-REGISTRY_PACKAGE_METADATA_CONTRACT = deep_merge(
-    PACKAGE_FILE_CONTRACT,
-    {
-        'additionalProperties': True,
-        'properties': {
-            'name': {
-                'type': 'string',
-            },
-            'downloads': {
-                'type': 'object',
-                'additionalProperties': True,
-                'properties': {
-                    'tarball': {
-                        'type': 'string',
-                    },
-                },
-                'required': ['tarball']
-            },
-        },
-        'required': PACKAGE_FILE_CONTRACT['required'][:] + ['downloads']
-    }
+# this does not support the full semver (does not allow a trailing -fooXYZ) and
+# is not restrictive enough for full semver, (allows '1.0'). But it's like
+# 'semver lite'.
+SemverString = NewType('SemverString', str)
+register_pattern(
+    SemverString,
+    r'^(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(\.(?:0|[1-9]\d*))?$',
 )
 
 
-class PackageConfig(APIObject):
-    SCHEMA = PACKAGE_FILE_CONTRACT
+@dataclass
+class Quoting(JsonSchemaMixin, Mergeable):
+    identifier: Optional[bool]
+    schema: Optional[bool]
+    database: Optional[bool]
+    project: Optional[bool]
 
 
-USER_CONFIG_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': True,
-    'properties': {
-        'send_anonymous_usage_stats': {
-            'type': 'boolean',
-        },
-        'use_colors': {
-            'type': 'boolean',
-        },
-    },
+@dataclass
+class Package(Replaceable, HyphenatedJsonSchemaMixin):
+    pass
+
+
+@dataclass
+class LocalPackage(Package):
+    local: str
+
+
+# `float` also allows `int`, according to PEP484 (and jsonschema!)
+RawVersion = Union[str, float]
+
+
+@dataclass
+class GitPackage(Package):
+    git: str
+    revision: Optional[RawVersion]
+    warn_unpinned: Optional[bool] = None
+
+    def get_revisions(self) -> List[str]:
+        if self.revision is None:
+            return []
+        else:
+            return [str(self.revision)]
+
+
+@dataclass
+class RegistryPackage(Package):
+    package: str
+    version: Union[RawVersion, List[RawVersion]]
+
+    def get_versions(self) -> List[str]:
+        if isinstance(self.version, list):
+            return [str(v) for v in self.version]
+        else:
+            return [str(self.version)]
+
+
+PackageSpec = Union[LocalPackage, GitPackage, RegistryPackage]
+
+
+@dataclass
+class PackageConfig(JsonSchemaMixin, Replaceable):
+    packages: List[PackageSpec]
+
+
+@dataclass
+class ProjectPackageMetadata:
+    name: str
+    packages: List[PackageSpec]
+
+    @classmethod
+    def from_project(cls, project):
+        return cls(name=project.project_name,
+                   packages=project.packages.packages)
+
+
+@dataclass
+class Downloads(ExtensibleJsonSchemaMixin, Replaceable):
+    tarball: str
+
+
+@dataclass
+class RegistryPackageMetadata(
+    ExtensibleJsonSchemaMixin,
+    ProjectPackageMetadata,
+):
+    downloads: Downloads
+
+
+# A list of all the reserved words that packages may not have as names.
+BANNED_PROJECT_NAMES = {
+    '_sql_results',
+    'adapter',
+    'api',
+    'column',
+    'config',
+    'context',
+    'database',
+    'env',
+    'env_var',
+    'exceptions',
+    'execute',
+    'flags',
+    'fromjson',
+    'fromyaml',
+    'graph',
+    'invocation_id',
+    'load_agate_table',
+    'load_result',
+    'log',
+    'model',
+    'modules',
+    'post_hooks',
+    'pre_hooks',
+    'ref',
+    'render',
+    'return',
+    'run_started_at',
+    'schema',
+    'source',
+    'sql',
+    'sql_now',
+    'store_result',
+    'store_raw_result',
+    'target',
+    'this',
+    'tojson',
+    'toyaml',
+    'try_or_compiler_error',
+    'var',
+    'write',
 }
 
 
-PROFILE_INFO_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'profile_name': {
-            'type': 'string',
-        },
-        'target_name': {
-            'type': 'string',
-        },
-        'config': USER_CONFIG_CONTRACT,
-        'threads': {
-            'type': 'number',
-        },
-        'credentials': {
-            'type': 'object',
-            'additionalProperties': True,
-        },
-    },
-    'required': [
-        'profile_name', 'target_name', 'config', 'threads', 'credentials'
-    ],
-}
-
-
-class ProfileConfig(APIObject):
-    SCHEMA = PROFILE_INFO_CONTRACT
-
-
-def _merge_requirements(base, *args):
-    required = base[:]
-    for arg in args:
-        required.extend(arg['required'])
-    return required
-
-
-CONFIG_CONTRACT = deep_merge(
-    PROJECT_CONTRACT,
-    PACKAGE_FILE_CONTRACT,
-    PROFILE_INFO_CONTRACT,
-    {
-        'properties': {
-            'cli_vars': {
-                'type': 'object',
-                'additionalProperties': True,
-            },
-            # override quoting: both 'identifier' and 'schema' must be
-            # populated
-            'quoting': {
-                'required': ['identifier', 'schema'],
-            },
-        },
-        'required': _merge_requirements(
-            ['cli_vars'],
-            PROJECT_CONTRACT,
-            PACKAGE_FILE_CONTRACT,
-            PROFILE_INFO_CONTRACT
+@dataclass
+class Project(HyphenatedJsonSchemaMixin, Replaceable):
+    name: Name
+    version: Union[SemverString, float]
+    config_version: int
+    project_root: Optional[str] = None
+    source_paths: Optional[List[str]] = None
+    macro_paths: Optional[List[str]] = None
+    data_paths: Optional[List[str]] = None
+    test_paths: Optional[List[str]] = None
+    analysis_paths: Optional[List[str]] = None
+    docs_paths: Optional[List[str]] = None
+    asset_paths: Optional[List[str]] = None
+    target_path: Optional[str] = None
+    snapshot_paths: Optional[List[str]] = None
+    clean_targets: Optional[List[str]] = None
+    profile: Optional[str] = None
+    log_path: Optional[str] = None
+    modules_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)
+    require_dbt_version: Optional[Union[List[str], str]] = None
+    models: Dict[str, Any] = field(default_factory=dict)
+    seeds: Dict[str, Any] = field(default_factory=dict)
+    snapshots: Dict[str, Any] = field(default_factory=dict)
+    analyses: Dict[str, Any] = field(default_factory=dict)
+    sources: Dict[str, Any] = field(default_factory=dict)
+    vars: Optional[Dict[str, Any]] = field(
+        default=None,
+        metadata=dict(
+            description='map project names to their vars override dicts',
         ),
-    },
-)
-
-
-def update_config_contract(typename, connection):
-    PROFILE_INFO_CONTRACT['properties']['credentials']['anyOf'].append(
-        connection.SCHEMA
     )
-    CONFIG_CONTRACT['properties']['credentials']['anyOf'].append(
-        connection.SCHEMA
+    packages: List[PackageSpec] = field(default_factory=list)
+    query_comment: Optional[Union[QueryComment, NoValue, str]] = NoValue()
+
+    @classmethod
+    def from_dict(cls, data, validate=True) -> 'Project':
+        result = super().from_dict(data, validate=validate)
+        if result.name in BANNED_PROJECT_NAMES:
+            raise ValidationError(
+                f'Invalid project name: {result.name} is a reserved word'
+            )
+
+        return result
+
+
+@dataclass
+class UserConfig(ExtensibleJsonSchemaMixin, Replaceable, UserConfigContract):
+    send_anonymous_usage_stats: bool = DEFAULT_SEND_ANONYMOUS_USAGE_STATS
+    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)
+
+
+@dataclass
+class ProfileConfig(HyphenatedJsonSchemaMixin, Replaceable):
+    profile_name: str = field(metadata={'preserve_underscore': True})
+    target_name: str = field(metadata={'preserve_underscore': True})
+    config: UserConfig
+    threads: int
+    # TODO: make this a dynamic union of some kind?
+    credentials: Optional[Dict[str, Any]]
+
+
+@dataclass
+class ConfiguredQuoting(Quoting, Replaceable):
+    identifier: bool
+    schema: bool
+    database: Optional[bool]
+    project: Optional[bool]
+
+
+@dataclass
+class Configuration(Project, ProfileConfig):
+    cli_vars: Dict[str, Any] = field(
+        default_factory=dict,
+        metadata={'preserve_underscore': True},
     )
+    quoting: Optional[ConfiguredQuoting] = None
 
 
-class Configuration(APIObject):
-    SCHEMA = CONFIG_CONTRACT
-
-
-PROJECTS_LIST_PROJECT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'patternProperties': {
-        '.*': CONFIG_CONTRACT,
-    },
-}
-
-
-class ProjectList(APIObject):
-    SCHEMA = PROJECTS_LIST_PROJECT
-
-    def serialize(self):
-        return {k: v.serialize() for k, v in self._contents.items()}
+@dataclass
+class ProjectList(JsonSchemaMixin):
+    projects: Dict[str, Project]

core/dbt/contracts/relation.py

@@ -0,0 +1,122 @@
+from collections.abc import Mapping
+from dataclasses import dataclass, fields
+from typing import (
+    Optional, TypeVar, Generic, Dict,
+)
+from typing_extensions import Protocol
+
+from hologram import JsonSchemaMixin
+from hologram.helpers import StrEnum
+
+from dbt import deprecations
+from dbt.contracts.util import Replaceable
+from dbt.exceptions import CompilationException
+from dbt.utils import deep_merge
+
+
+class RelationType(StrEnum):
+    Table = 'table'
+    View = 'view'
+    CTE = 'cte'
+    MaterializedView = 'materializedview'
+    External = 'external'
+
+
+class ComponentName(StrEnum):
+    Database = 'database'
+    Schema = 'schema'
+    Identifier = 'identifier'
+
+
+class HasQuoting(Protocol):
+    quoting: Dict[str, bool]
+
+
+class FakeAPIObject(JsonSchemaMixin, Replaceable, Mapping):
+    # override the mapping truthiness, len is always >1
+    def __bool__(self):
+        return True
+
+    def __getitem__(self, key):
+        try:
+            return getattr(self, key)
+        except AttributeError:
+            raise KeyError(key) from None
+
+    def __iter__(self):
+        deprecations.warn('not-a-dictionary', obj=self)
+        for _, name in self._get_fields():
+            yield name
+
+    def __len__(self):
+        deprecations.warn('not-a-dictionary', obj=self)
+        return len(fields(self.__class__))
+
+    def incorporate(self, **kwargs):
+        value = self.to_dict()
+        value = deep_merge(value, kwargs)
+        return self.from_dict(value)
+
+
+T = TypeVar('T')
+
+
+@dataclass
+class _ComponentObject(FakeAPIObject, Generic[T]):
+    database: T
+    schema: T
+    identifier: T
+
+    def get_part(self, key: ComponentName) -> T:
+        if key == ComponentName.Database:
+            return self.database
+        elif key == ComponentName.Schema:
+            return self.schema
+        elif key == ComponentName.Identifier:
+            return self.identifier
+        else:
+            raise ValueError(
+                'Got a key of {}, expected one of {}'
+                .format(key, list(ComponentName))
+            )
+
+    def replace_dict(self, dct: Dict[ComponentName, T]):
+        kwargs: Dict[str, T] = {}
+        for k, v in dct.items():
+            kwargs[str(k)] = v
+        return self.replace(**kwargs)
+
+
+@dataclass
+class Policy(_ComponentObject[bool]):
+    database: bool = True
+    schema: bool = True
+    identifier: bool = True
+
+
+@dataclass
+class Path(_ComponentObject[Optional[str]]):
+    database: Optional[str]
+    schema: Optional[str]
+    identifier: Optional[str]
+
+    def __post_init__(self):
+        # handle pesky jinja2.Undefined sneaking in here and messing up rende
+        if not isinstance(self.database, (type(None), str)):
+            raise CompilationException(
+                'Got an invalid path database: {}'.format(self.database)
+            )
+        if not isinstance(self.schema, (type(None), str)):
+            raise CompilationException(
+                'Got an invalid path schema: {}'.format(self.schema)
+            )
+        if not isinstance(self.identifier, (type(None), str)):
+            raise CompilationException(
+                'Got an invalid path identifier: {}'.format(self.identifier)
+            )
+
+    def get_lowered_part(self, key: ComponentName) -> Optional[str]:
+        part = self.get_part(key)
+        if part is not None:
+            part = part.lower()
+        return part

core/dbt/contracts/results.py

@@ -1,47 +1,50 @@
-from dbt.api.object import APIObject
-from dbt.utils import deep_merge, timestring
-from dbt.contracts.common import named_property
-from dbt.contracts.graph.manifest import COMPILE_RESULT_NODE_CONTRACT
-from dbt.contracts.graph.unparsed import TIME_CONTRACT
-from dbt.contracts.graph.parsed import PARSED_SOURCE_DEFINITION_CONTRACT
+from dbt.contracts.graph.manifest import CompileResultNode
+from dbt.contracts.graph.unparsed import (
+    FreshnessThreshold
+)
+from dbt.contracts.graph.parsed import ParsedSourceDefinition
+from dbt.contracts.util import (
+    BaseArtifactMetadata,
+    ArtifactMixin,
+    VersionedSchema,
+    Replaceable,
+    schema_version,
+)
+from dbt.exceptions import InternalException
+from dbt.logger import (
+    TimingProcessor,
+    JsonOnly,
+    GLOBAL_LOGGER as logger,
+)
+from dbt.utils import lowercase
+from hologram.helpers import StrEnum
+from hologram import JsonSchemaMixin
+
+import agate
+
+from dataclasses import dataclass, field
+from datetime import datetime
+from typing import Union, Dict, List, Optional, Any, NamedTuple, Sequence
+
+from dbt.clients.system import write_json
 
 
-TIMING_INFO_CONTRACT = {
-    'type': 'object',
-    'properties': {
-        'name': {
-            'type': 'string',
-        },
-        'started_at': {
-            'type': 'string',
-            'format': 'date-time',
-        },
-        'completed_at': {
-            'type': 'string',
-            'format': 'date-time',
-        },
-    }
-}
-
-
-class TimingInfo(APIObject):
-
-    SCHEMA = TIMING_INFO_CONTRACT
-
-    @classmethod
-    def create(cls, name):
-        return cls(name=name)
+@dataclass
+class TimingInfo(JsonSchemaMixin):
+    name: str
+    started_at: Optional[datetime] = None
+    completed_at: Optional[datetime] = None
 
     def begin(self):
-        self.set('started_at', timestring())
+        self.started_at = datetime.utcnow()
 
     def end(self):
-        self.set('completed_at', timestring())
+        self.completed_at = datetime.utcnow()
 
 
 class collect_timing_info:
-    def __init__(self, name):
-        self.timing_info = TimingInfo.create(name)
+    def __init__(self, name: str):
+        self.timing_info = TimingInfo(name=name)
 
     def __enter__(self):
         self.timing_info.begin()
@@ -49,484 +52,410 @@ 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')
 
 
-class NodeSerializable(APIObject):
-
-    def serialize(self):
-        result = super(NodeSerializable, self).serialize()
-        result['node'] = self.node.serialize()
-        return result
+class NodeStatus(StrEnum):
+    Success = "success"
+    Error = "error"
+    Fail = "fail"
+    Warn = "warn"
+    Skipped = "skipped"
+    Pass = "pass"
+    RuntimeErr = "runtime error"
 
 
-PARTIAL_RESULT_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': 'The partial result of a single node being run',
-    'properties': {
-        'error': {
-            'type': ['string', 'null'],
-            'description': 'The error string, or None if there was no error',
-        },
-        'status': {
-            'type': ['string', 'null', 'number', 'boolean'],
-            'description': 'The status result of the node execution',
-        },
-        'execution_time': {
-            'type': 'number',
-            'description': 'The execution time, in seconds',
-        },
-        'thread_id': {
-            'type': ['string', 'null'],
-            'description': 'ID of the executing thread, e.g. Thread-3',
-        },
-        'timing': {
-            'type': 'array',
-            'items': TIMING_INFO_CONTRACT,
-        },
-        'node': COMPILE_RESULT_NODE_CONTRACT,
-    },
-    'required': ['node', 'status', 'error', 'execution_time', 'thread_id',
-                 'timing'],
-}
+class RunStatus(StrEnum):
+    Success = NodeStatus.Success
+    Error = NodeStatus.Error
+    Skipped = NodeStatus.Skipped
 
 
-class PartialResult(NodeSerializable):
-    """Represent a "partial" execution result, i.e. one that has not (fully)
-    been executed.
+class TestStatus(StrEnum):
+    Pass = NodeStatus.Pass
+    Error = NodeStatus.Error
+    Fail = NodeStatus.Fail
+    Warn = NodeStatus.Warn
 
-    This may be an ephemeral node (they are not compiled) or any error.
-    """
-    SCHEMA = PARTIAL_RESULT_CONTRACT
 
-    def __init__(self, node, error=None, status=None, execution_time=0,
-                 thread_id=None, timing=None):
-        if timing is None:
-            timing = []
-        super(PartialResult, self).__init__(
-            node=node,
-            error=error,
-            status=status,
-            execution_time=execution_time,
-            thread_id=thread_id,
-            timing=timing,
-        )
+class FreshnessStatus(StrEnum):
+    Pass = NodeStatus.Pass
+    Warn = NodeStatus.Warn
+    Error = NodeStatus.Error
+    RuntimeErr = NodeStatus.RuntimeErr
+
+
+@dataclass
+class BaseResult(JsonSchemaMixin):
+    status: Union[RunStatus, TestStatus, FreshnessStatus]
+    timing: List[TimingInfo]
+    thread_id: str
+    execution_time: float
+    message: Optional[Union[str, int]]
+    adapter_response: Dict[str, Any]
+
+
+@dataclass
+class NodeResult(BaseResult):
+    node: CompileResultNode
+
+
+@dataclass
+class RunResult(NodeResult):
+    agate_table: Optional[agate.Table] = None
 
-    # if the result got to the point where it could be skipped/failed, we would
-    # be returning a real result, not a partial.
     @property
     def skipped(self):
-        return False
-
-    @property
-    def failed(self):
-        return None
+        return self.status == RunStatus.Skipped
 
 
-RUN_MODEL_RESULT_CONTRACT = deep_merge(PARTIAL_RESULT_CONTRACT, {
-    'description': 'The result of a single node being run',
-    'properties': {
-        'skip': {
-            'type': 'boolean',
-            'description': 'True if this node was skipped',
-        },
-        # This is assigned by dbt.ui.printer.print_test_result_line, if a test
-        # has no error and a non-zero status
-        'fail': {
-            'type': ['boolean', 'null'],
-            'description': 'On tests, true if the test failed',
-        },
-    },
-    'required': ['skip', 'fail']
-})
+@dataclass
+class ExecutionResult(JsonSchemaMixin):
+    results: Sequence[BaseResult]
+    elapsed_time: float
+
+    def __len__(self):
+        return len(self.results)
+
+    def __iter__(self):
+        return iter(self.results)
+
+    def __getitem__(self, idx):
+        return self.results[idx]
 
 
-class RunModelResult(NodeSerializable):
-    SCHEMA = RUN_MODEL_RESULT_CONTRACT
-
-    def __init__(self, node, error=None, skip=False, status=None, failed=None,
-                 thread_id=None, timing=None, execution_time=0):
-        if timing is None:
-            timing = []
-        super(RunModelResult, self).__init__(
-            node=node,
-            error=error,
-            skip=skip,
-            status=status,
-            fail=failed,
-            execution_time=execution_time,
-            thread_id=thread_id,
-            timing=timing,
-        )
-
-    # these all get set after the fact, generally
-    error = named_property('error',
-                           'If there was an error, the text of that error')
-    skip = named_property('skip', 'True if the model was skipped')
-    fail = named_property('fail', 'True if this was a test and it failed')
-    status = named_property('status', 'The status of the model execution')
-    execution_time = named_property('execution_time',
-                                    'The time in seconds to execute the model')
-    thread_id = named_property(
-        'thread_id',
-        'ID of the executing thread, e.g. Thread-3'
-    )
-    timing = named_property(
-        'timing',
-        'List of TimingInfo objects'
+@dataclass
+class RunResultsMetadata(BaseArtifactMetadata):
+    dbt_schema_version: str = field(
+        default_factory=lambda: str(RunResultsArtifact.dbt_schema_version)
     )
 
-    @property
-    def failed(self):
-        return self.fail
 
-    @property
-    def skipped(self):
-        return self.skip
+@dataclass
+class RunResultOutput(BaseResult):
+    unique_id: str
 
 
-EXECUTION_RESULT_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': 'The result of a single dbt invocation',
-    'properties': {
-        'results': {
-            'type': 'array',
-            'items': {
-                'anyOf': [
-                    RUN_MODEL_RESULT_CONTRACT,
-                    PARTIAL_RESULT_CONTRACT,
-                ]
-            },
-            'description': 'An array of results, one per model',
-        },
-        'generated_at': {
-            'type': 'string',
-            'format': 'date-time',
-            'description': (
-                'The time at which the execution result was generated'
-            ),
-        },
-        'elapsed_time': {
-            'type': 'number',
-            'description': (
-                'The time elapsed from before_run to after_run (hooks are not '
-                'included)'
-            ),
-        }
-    },
-    'required': ['results', 'generated_at', 'elapsed_time'],
-}
+def process_run_result(result: RunResult) -> RunResultOutput:
+    return RunResultOutput(
+        unique_id=result.node.unique_id,
+        status=result.status,
+        timing=result.timing,
+        thread_id=result.thread_id,
+        execution_time=result.execution_time,
+        message=result.message,
+        adapter_response=result.adapter_response
+    )
 
 
-class ExecutionResult(APIObject):
-    SCHEMA = EXECUTION_RESULT_CONTRACT
+@dataclass
+class RunExecutionResult(
+    ExecutionResult,
+):
+    results: Sequence[RunResult]
+    args: Dict[str, Any] = field(default_factory=dict)
+    generated_at: datetime = field(default_factory=datetime.utcnow)
 
-    def serialize(self):
-        return {
-            'results': [r.serialize() for r in self.results],
-            'generated_at': self.generated_at,
-            'elapsed_time': self.elapsed_time,
-        }
-
-
-SOURCE_FRESHNESS_RESULT_CONTRACT = deep_merge(PARTIAL_RESULT_CONTRACT, {
-    'properties': {
-        'max_loaded_at': {
-            'type': 'string',
-            'format': 'date-time',
-        },
-        'snapshotted_at': {
-            'type': 'string',
-            'format': 'date-time',
-        },
-        'age': {
-            'type': 'number',
-        },
-        'status': {
-            'enum': ['pass', 'warn', 'error']
-        },
-        'node': PARSED_SOURCE_DEFINITION_CONTRACT,
-    },
-    'required': ['max_loaded_at', 'snapshotted_at', 'age']
-})
-
-
-class SourceFreshnessResult(NodeSerializable):
-    SCHEMA = SOURCE_FRESHNESS_RESULT_CONTRACT
-
-    def __init__(self, node, max_loaded_at, snapshotted_at,
-                 age, status, thread_id, error=None,
-                 timing=None, execution_time=0):
-        max_loaded_at = max_loaded_at.isoformat()
-        snapshotted_at = snapshotted_at.isoformat()
-        if timing is None:
-            timing = []
-        super(SourceFreshnessResult, self).__init__(
-            node=node,
-            max_loaded_at=max_loaded_at,
-            snapshotted_at=snapshotted_at,
-            age=age,
-            status=status,
-            thread_id=thread_id,
-            error=error,
-            timing=timing,
-            execution_time=execution_time
+    def write(self, path: str):
+        writable = RunResultsArtifact.from_execution_results(
+            results=self.results,
+            elapsed_time=self.elapsed_time,
+            generated_at=self.generated_at,
+            args=self.args,
         )
-
-    @property
-    def failed(self):
-        return self.status == 'error'
-
-    @property
-    def skipped(self):
-        return False
+        writable.write(path)
 
 
-FRESHNESS_METADATA_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'generated_at': {
-            'type': 'string',
-            'format': 'date-time',
-            'description': (
-                'The time at which the execution result was generated'
-            ),
-        },
-        'elapsed_time': {
-            'type': 'number',
-            'description': (
-                'The time elapsed from before_run to after_run (hooks '
-                'are not included)'
-            ),
-        },
-    },
-    'required': ['generated_at', 'elapsed_time']
-}
+@dataclass
+@schema_version('run-results', 1)
+class RunResultsArtifact(ExecutionResult, ArtifactMixin):
+    results: Sequence[RunResultOutput]
+    args: Dict[str, Any] = field(default_factory=dict)
 
-
-FRESHNESS_RESULTS_CONTRACT = deep_merge(FRESHNESS_METADATA_CONTRACT, {
-    'description': 'The result of a single dbt source freshness invocation',
-    'properties': {
-        'results': {
-            'type': 'array',
-            'items': {
-                'anyOf': [
-                    PARTIAL_RESULT_CONTRACT,
-                    SOURCE_FRESHNESS_RESULT_CONTRACT,
-                ],
-            },
-        },
-    },
-    'required': ['results'],
-})
-
-
-class FreshnessExecutionResult(APIObject):
-    SCHEMA = FRESHNESS_RESULTS_CONTRACT
-
-    def __init__(self, elapsed_time, generated_at, results):
-        super(FreshnessExecutionResult, self).__init__(
-            elapsed_time=elapsed_time,
+    @classmethod
+    def from_execution_results(
+        cls,
+        results: Sequence[RunResult],
+        elapsed_time: float,
+        generated_at: datetime,
+        args: Dict,
+    ):
+        processed_results = [process_run_result(result) for result in results]
+        meta = RunResultsMetadata(
+            dbt_schema_version=str(cls.dbt_schema_version),
             generated_at=generated_at,
-            results=results
+        )
+        return cls(
+            metadata=meta,
+            results=processed_results,
+            elapsed_time=elapsed_time,
+            args=args
         )
 
-    def serialize(self):
-        return {
-            'generated_at': self.generated_at,
-            'elapsed_time': self.elapsed_time,
-            'results': [s.serialize() for s in self.results]
-        }
-
-    def write(self, path):
-        """Create a new object with the desired output schema and write it."""
-        meta = {
-            'generated_at': self.generated_at,
-            'elapsed_time': self.elapsed_time,
-        }
-        sources = {}
-        for result in self.results:
-            unique_id = result.node.unique_id
-            if result.error is not None:
-                result_dict = {
-                    'error': result.error,
-                    'state': 'runtime error'
-                }
-            else:
-                result_dict = {
-                    'max_loaded_at': result.max_loaded_at,
-                    'snapshotted_at': result.snapshotted_at,
-                    'max_loaded_at_time_ago_in_s': result.age,
-                    'state': result.status,
-                    'criteria': result.node.freshness,
-                }
-            sources[unique_id] = result_dict
-        output = FreshnessRunOutput(meta=meta, sources=sources)
-        output.write(path)
+    def write(self, path: str, omit_none=False):
+        write_json(path, self.to_dict(omit_none=omit_none))
 
 
-def _copykeys(src, keys, **updates):
-    return {k: getattr(src, k) for k in keys}
+@dataclass
+class RunOperationResult(ExecutionResult):
+    success: bool
 
 
-SOURCE_FRESHNESS_OUTPUT_ERROR_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': (
-        'The source freshness output for a single source table',
-    ),
-    'properties': {
-        'error': {
-            'type': 'string',
-            'description': 'The error string',
-        },
-        'state': {
-            'enum': ['runtime error'],
-        },
-    }
-}
+@dataclass
+class RunOperationResultMetadata(BaseArtifactMetadata):
+    dbt_schema_version: str = field(default_factory=lambda: str(
+        RunOperationResultsArtifact.dbt_schema_version
+    ))
 
 
-SOURCE_FRESHNESS_OUTPUT_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': (
-        'The source freshness output for a single source table',
-    ),
-    'properties': {
-        'max_loaded_at': {
-            'type': 'string',
-            'format': 'date-time',
-        },
-        'snapshotted_at': {
-            'type': 'string',
-            'format': 'date-time',
-        },
-        'max_loaded_at_time_ago_in_s': {
-            'type': 'number',
-        },
-        'state': {
-            'enum': ['pass', 'warn', 'error']
-        },
-        'criteria': {
-            'type': 'object',
-            'additionalProperties': False,
-            'properties': {
-                'warn_after': TIME_CONTRACT,
-                'error_after': TIME_CONTRACT,
-            },
-        },
-        'required': ['state', 'criteria', 'max_loaded_at', 'snapshotted_at',
-                     'max_loaded_at_time_ago_in_s']
-    }
-}
+@dataclass
+@schema_version('run-operation-result', 1)
+class RunOperationResultsArtifact(RunOperationResult, ArtifactMixin):
 
-
-FRESHNESS_RUN_OUTPUT_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'description': 'The output contract for dbt source freshness invocations',
-    'properties': {
-        'meta': FRESHNESS_METADATA_CONTRACT,
-        'sources': {
-            'type': 'object',
-            'additionalProperties': False,
-            'description': (
-                'A collection of the source results, stored by their unique '
-                'IDs.'
-            ),
-            'patternProperties': {
-                '.*': {
-                    'anyOf': [
-                        SOURCE_FRESHNESS_OUTPUT_ERROR_CONTRACT,
-                        SOURCE_FRESHNESS_OUTPUT_CONTRACT
-                    ],
-                },
-            },
-        }
-    }
-}
-
-
-class FreshnessRunOutput(APIObject):
-    SCHEMA = FRESHNESS_RUN_OUTPUT_CONTRACT
-
-    def __init__(self, meta, sources):
-        super(FreshnessRunOutput, self).__init__(meta=meta, sources=sources)
-
-
-REMOTE_COMPILE_RESULT_CONTRACT = {
-    'type': 'object',
-    'additionalProperties': False,
-    'properties': {
-        'raw_sql': {
-            'type': 'string',
-        },
-        'compiled_sql': {
-            'type': 'string',
-        },
-        'timing': {
-            'type': 'array',
-            'items': TIMING_INFO_CONTRACT,
-        },
-    },
-    'required': ['raw_sql', 'compiled_sql', 'timing']
-}
-
-
-class RemoteCompileResult(APIObject):
-    SCHEMA = REMOTE_COMPILE_RESULT_CONTRACT
-
-    def __init__(self, raw_sql, compiled_sql, node, timing=None, **kwargs):
-        if timing is None:
-            timing = []
-        # this should not show up in the serialized output.
-        self.node = node
-        super(RemoteCompileResult, self).__init__(
-            raw_sql=raw_sql,
-            compiled_sql=compiled_sql,
-            timing=timing,
-            **kwargs
+    @classmethod
+    def from_success(
+        cls,
+        success: bool,
+        elapsed_time: float,
+        generated_at: datetime,
+    ):
+        meta = RunOperationResultMetadata(
+            dbt_schema_version=str(cls.dbt_schema_version),
+            generated_at=generated_at,
         )
+        return cls(
+            metadata=meta,
+            results=[],
+            elapsed_time=elapsed_time,
+            success=success,
+        )
+
+# due to issues with typing.Union collapsing subclasses, this can't subclass
+# PartialResult
+
+
+@dataclass
+class SourceFreshnessResult(NodeResult):
+    node: ParsedSourceDefinition
+    status: FreshnessStatus
+    max_loaded_at: datetime
+    snapshotted_at: datetime
+    age: float
 
     @property
-    def error(self):
-        return None
+    def skipped(self):
+        return False
 
 
-REMOTE_RUN_RESULT_CONTRACT = deep_merge(REMOTE_COMPILE_RESULT_CONTRACT, {
-    'properties': {
-        'table': {
-            'type': 'object',
-            'properties': {
-                'column_names': {
-                    'type': 'array',
-                    'items': {'type': 'string'},
-                },
-                'rows': {
-                    'type': 'array',
-                    # any item type is ok
-                },
-            },
-            'required': ['rows', 'column_names'],
-        },
-    },
-    'required': ['table'],
-})
+class FreshnessErrorEnum(StrEnum):
+    runtime_error = 'runtime error'
 
 
-class RemoteRunResult(RemoteCompileResult):
-    SCHEMA = REMOTE_RUN_RESULT_CONTRACT
+@dataclass
+class SourceFreshnessRuntimeError(JsonSchemaMixin):
+    unique_id: str
+    error: Optional[Union[str, int]]
+    status: FreshnessErrorEnum
 
-    def __init__(self, raw_sql, compiled_sql, node, timing=None, table=None):
-        if table is None:
-            table = []
-        super(RemoteRunResult, self).__init__(
-            raw_sql=raw_sql,
-            compiled_sql=compiled_sql,
-            timing=timing,
-            table=table,
-            node=node
+
+@dataclass
+class SourceFreshnessOutput(JsonSchemaMixin):
+    unique_id: str
+    max_loaded_at: datetime
+    snapshotted_at: datetime
+    max_loaded_at_time_ago_in_s: float
+    status: FreshnessStatus
+    criteria: FreshnessThreshold
+    adapter_response: Dict[str, Any]
+
+
+@dataclass
+class PartialSourceFreshnessResult(NodeResult):
+    status: FreshnessStatus
+
+    @property
+    def skipped(self):
+        return False
+
+
+FreshnessNodeResult = Union[PartialSourceFreshnessResult,
+                            SourceFreshnessResult]
+FreshnessNodeOutput = Union[SourceFreshnessRuntimeError, SourceFreshnessOutput]
+
+
+def process_freshness_result(
+    result: FreshnessNodeResult
+) -> FreshnessNodeOutput:
+    unique_id = result.node.unique_id
+    if result.status == FreshnessStatus.RuntimeErr:
+        return SourceFreshnessRuntimeError(
+            unique_id=unique_id,
+            error=result.message,
+            status=FreshnessErrorEnum.runtime_error,
+        )
+
+    # we know that this must be a SourceFreshnessResult
+    if not isinstance(result, SourceFreshnessResult):
+        raise InternalException(
+            'Got {} instead of a SourceFreshnessResult for a '
+            'non-error result in freshness execution!'
+            .format(type(result))
+        )
+    # if we're here, we must have a non-None freshness threshold
+    criteria = result.node.freshness
+    if criteria is None:
+        raise InternalException(
+            'Somehow evaluated a freshness result for a source '
+            'that has no freshness criteria!'
+        )
+    return SourceFreshnessOutput(
+        unique_id=unique_id,
+        max_loaded_at=result.max_loaded_at,
+        snapshotted_at=result.snapshotted_at,
+        max_loaded_at_time_ago_in_s=result.age,
+        status=result.status,
+        criteria=criteria,
+        adapter_response=result.adapter_response
+    )
+
+
+@dataclass
+class FreshnessMetadata(BaseArtifactMetadata):
+    dbt_schema_version: str = field(
+        default_factory=lambda: str(
+            FreshnessExecutionResultArtifact.dbt_schema_version
+        )
+    )
+
+
+@dataclass
+class FreshnessResult(ExecutionResult):
+    metadata: FreshnessMetadata
+    results: Sequence[FreshnessNodeResult]
+
+    @classmethod
+    def from_node_results(
+        cls,
+        results: List[FreshnessNodeResult],
+        elapsed_time: float,
+        generated_at: datetime,
+    ):
+        meta = FreshnessMetadata(generated_at=generated_at)
+        return cls(metadata=meta, results=results, elapsed_time=elapsed_time)
+
+
+@dataclass
+@schema_version('sources', 1)
+class FreshnessExecutionResultArtifact(
+    ArtifactMixin,
+    VersionedSchema,
+):
+    metadata: FreshnessMetadata
+    results: Sequence[FreshnessNodeOutput]
+    elapsed_time: float
+
+    @classmethod
+    def from_result(cls, base: FreshnessResult):
+        processed = [process_freshness_result(r) for r in base.results]
+        return cls(
+            metadata=base.metadata,
+            results=processed,
+            elapsed_time=base.elapsed_time,
+        )
+
+
+Primitive = Union[bool, str, float, None]
+
+CatalogKey = NamedTuple(
+    'CatalogKey',
+    [('database', Optional[str]), ('schema', str), ('name', str)]
+)
+
+
+@dataclass
+class StatsItem(JsonSchemaMixin):
+    id: str
+    label: str
+    value: Primitive
+    description: Optional[str]
+    include: bool
+
+
+StatsDict = Dict[str, StatsItem]
+
+
+@dataclass
+class ColumnMetadata(JsonSchemaMixin):
+    type: str
+    comment: Optional[str]
+    index: int
+    name: str
+
+
+ColumnMap = Dict[str, ColumnMetadata]
+
+
+@dataclass
+class TableMetadata(JsonSchemaMixin):
+    type: str
+    database: Optional[str]
+    schema: str
+    name: str
+    comment: Optional[str]
+    owner: Optional[str]
+
+
+@dataclass
+class CatalogTable(JsonSchemaMixin, Replaceable):
+    metadata: TableMetadata
+    columns: ColumnMap
+    stats: StatsDict
+    # the same table with two unique IDs will just be listed two times
+    unique_id: Optional[str] = None
+
+    def key(self) -> CatalogKey:
+        return CatalogKey(
+            lowercase(self.metadata.database),
+            self.metadata.schema.lower(),
+            self.metadata.name.lower(),
+        )
+
+
+@dataclass
+class CatalogMetadata(BaseArtifactMetadata):
+    dbt_schema_version: str = field(
+        default_factory=lambda: str(CatalogArtifact.dbt_schema_version)
+    )
+
+
+@dataclass
+class CatalogResults(JsonSchemaMixin):
+    nodes: Dict[str, CatalogTable]
+    sources: Dict[str, CatalogTable]
+    errors: Optional[List[str]]
+    _compile_results: Optional[Any] = None
+
+
+@dataclass
+@schema_version('catalog', 1)
+class CatalogArtifact(CatalogResults, ArtifactMixin):
+    metadata: CatalogMetadata
+
+    @classmethod
+    def from_results(
+        cls,
+        generated_at: datetime,
+        nodes: Dict[str, CatalogTable],
+        sources: Dict[str, CatalogTable],
+        compile_results: Optional[Any],
+        errors: Optional[List[str]]
+    ) -> 'CatalogArtifact':
+        meta = CatalogMetadata(generated_at=generated_at)
+        return cls(
+            metadata=meta,
+            nodes=nodes,
+            sources=sources,
+            errors=errors,
+            _compile_results=compile_results,
         )

core/dbt/contracts/rpc.py

@@ -0,0 +1,758 @@
+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 hologram import JsonSchemaMixin
+from hologram.helpers import 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(JsonSchemaMixin):
+    timeout: Optional[float]
+    task_tags: TaskTags
+
+
+@dataclass
+class RPCExecParameters(RPCParameters):
+    name: str
+    sql: str
+    macros: Optional[str]
+
+
+@dataclass
+class RPCCompileParameters(RPCParameters):
+    threads: Optional[int] = None
+    models: Union[None, str, List[str]] = None
+    exclude: Union[None, str, List[str]] = None
+    selector: Optional[str] = None
+    state: Optional[str] = None
+
+
+@dataclass
+class RPCRunParameters(RPCParameters):
+    threads: Optional[int] = None
+    models: 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 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(JsonSchemaMixin):
+    # 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
+
+
+@dataclass
+class GetManifestParameters(RPCParameters):
+    pass
+
+# Outputs
+
+
+@dataclass
+class RemoteResult(VersionedSchema):
+    logs: List[LogMessage]
+
+
+@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(JsonSchemaMixin):
+    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(JsonSchemaMixin):
+    state: TaskHandlerState
+    start: Optional[datetime]
+    end: Optional[datetime]
+    elapsed: Optional[float]
+
+
+@dataclass
+class TaskRow(TaskTiming):
+    task_id: TaskID
+    request_id: Union[str, int]
+    request_source: str
+    method: str
+    timeout: Optional[float]
+    tags: TaskTags
+
+
+@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]
+
+
+# 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]
+
+
+@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/selection.py

@@ -0,0 +1,22 @@
+from dataclasses import dataclass
+from hologram import JsonSchemaMixin
+
+from typing import List, Dict, Any, Union
+
+
+@dataclass
+class SelectorDefinition(JsonSchemaMixin):
+    name: str
+    definition: Union[str, Dict[str, Any]]
+    description: str = ''
+
+
+@dataclass
+class SelectorFile(JsonSchemaMixin):
+    selectors: List[SelectorDefinition]
+    version: int = 2
+
+
+# @dataclass
+# class SelectorCollection:
+#     packages: Dict[str, List[SelectorFile]] = field(default_factory=dict)

core/dbt/contracts/state.py

@@ -0,0 +1,18 @@
+from pathlib import Path
+from .graph.manifest import WritableManifest
+from typing import Optional
+from dbt.exceptions import IncompatibleSchemaException
+
+
+class PreviousState:
+    def __init__(self, path: Path):
+        self.path: Path = path
+        self.manifest: Optional[WritableManifest] = None
+
+        manifest_path = self.path / 'manifest.json'
+        if manifest_path.exists() and manifest_path.is_file():
+            try:
+                self.manifest = WritableManifest.read(str(manifest_path))
+            except IncompatibleSchemaException as exc:
+                exc.add_filename(str(manifest_path))
+                raise

core/dbt/contracts/util.py

@@ -0,0 +1,197 @@
+import dataclasses
+import os
+from datetime import datetime
+from typing import (
+    List, Tuple, ClassVar, Type, TypeVar, Dict, Any, Optional
+)
+
+from dbt.clients.system import write_json, read_json
+from dbt.exceptions import (
+    IncompatibleSchemaException,
+    InternalException,
+    RuntimeException,
+)
+from dbt.version import __version__
+from dbt.tracking import get_invocation_id
+from hologram import JsonSchemaMixin
+
+MacroKey = Tuple[str, str]
+SourceKey = Tuple[str, str]
+
+
+def list_str() -> List[str]:
+    """Mypy gets upset about stuff like:
+
+    from dataclasses import dataclass, field
+    from typing import Optional, List
+
+    @dataclass
+    class Foo:
+        x: Optional[List[str]] = field(default_factory=list)
+
+
+    Because `list` could be any kind of list, I guess
+    """
+    return []
+
+
+class Replaceable:
+    def replace(self, **kwargs):
+        return dataclasses.replace(self, **kwargs)
+
+
+class Mergeable(Replaceable):
+    def merged(self, *args):
+        """Perform a shallow merge, where the last non-None write wins. This is
+        intended to merge dataclasses that are a collection of optional values.
+        """
+        replacements = {}
+        cls = type(self)
+        for arg in args:
+            for field in dataclasses.fields(cls):
+                value = getattr(arg, field.name)
+                if value is not None:
+                    replacements[field.name] = value
+
+        return self.replace(**replacements)
+
+
+class Writable:
+    def write(self, path: str, omit_none: bool = False):
+        write_json(path, self.to_dict(omit_none=omit_none))  # type: ignore
+
+
+class AdditionalPropertiesMixin:
+    """Make this class an extensible property.
+
+    The underlying class definition must include a type definition for a field
+    named '_extra' that is of type `Dict[str, Any]`.
+    """
+    ADDITIONAL_PROPERTIES = True
+
+    @classmethod
+    def from_dict(cls, data, validate=True):
+        self = super().from_dict(data=data, validate=validate)
+        keys = self.to_dict(validate=False, omit_none=False)
+        for key, value in data.items():
+            if key not in keys:
+                self.extra[key] = value
+        return self
+
+    def to_dict(self, omit_none=True, validate=False):
+        data = super().to_dict(omit_none=omit_none, validate=validate)
+        data.update(self.extra)
+        return data
+
+    def replace(self, **kwargs):
+        dct = self.to_dict(omit_none=False, validate=False)
+        dct.update(kwargs)
+        return self.from_dict(dct)
+
+    @property
+    def extra(self):
+        return self._extra
+
+
+class Readable:
+    @classmethod
+    def read(cls, path: str):
+        try:
+            data = read_json(path)
+        except (EnvironmentError, ValueError) as exc:
+            raise RuntimeException(
+                f'Could not read {cls.__name__} at "{path}" as JSON: {exc}'
+            ) from exc
+
+        return cls.from_dict(data)  # type: ignore
+
+
+BASE_SCHEMAS_URL = 'https://schemas.getdbt.com/dbt/{name}/v{version}.json'
+
+
+@dataclasses.dataclass
+class SchemaVersion:
+    name: str
+    version: int
+
+    def __str__(self) -> str:
+        return BASE_SCHEMAS_URL.format(
+            name=self.name,
+            version=self.version,
+        )
+
+
+SCHEMA_VERSION_KEY = 'dbt_schema_version'
+
+
+METADATA_ENV_PREFIX = 'DBT_ENV_CUSTOM_ENV_'
+
+
+def get_metadata_env() -> Dict[str, str]:
+    return {
+        k[len(METADATA_ENV_PREFIX):]: v for k, v in os.environ.items()
+        if k.startswith(METADATA_ENV_PREFIX)
+    }
+
+
+@dataclasses.dataclass
+class BaseArtifactMetadata(JsonSchemaMixin):
+    dbt_schema_version: str
+    dbt_version: str = __version__
+    generated_at: datetime = dataclasses.field(
+        default_factory=datetime.utcnow
+    )
+    invocation_id: Optional[str] = dataclasses.field(
+        default_factory=get_invocation_id
+    )
+    env: Dict[str, str] = dataclasses.field(default_factory=get_metadata_env)
+
+
+def schema_version(name: str, version: int):
+    def inner(cls: Type[VersionedSchema]):
+        cls.dbt_schema_version = SchemaVersion(
+            name=name,
+            version=version,
+        )
+        return cls
+    return inner
+
+
+@dataclasses.dataclass
+class VersionedSchema(JsonSchemaMixin):
+    dbt_schema_version: ClassVar[SchemaVersion]
+
+    @classmethod
+    def json_schema(cls, embeddable: bool = False) -> Dict[str, Any]:
+        result = super().json_schema(embeddable=embeddable)
+        if not embeddable:
+            result['$id'] = str(cls.dbt_schema_version)
+        return result
+
+
+T = TypeVar('T', bound='ArtifactMixin')
+
+
+# metadata should really be a Generic[T_M] where T_M is a TypeVar bound to
+# BaseArtifactMetadata. Unfortunately this isn't possible due to a mypy issue:
+# https://github.com/python/mypy/issues/7520
+@dataclasses.dataclass(init=False)
+class ArtifactMixin(VersionedSchema, Writable, Readable):
+    metadata: BaseArtifactMetadata
+
+    @classmethod
+    def from_dict(
+        cls: Type[T], data: Dict[str, Any], validate: bool = True
+    ) -> T:
+        if cls.dbt_schema_version is None:
+            raise InternalException(
+                'Cannot call from_dict with no schema version!'
+            )
+
+        if validate:
+            expected = str(cls.dbt_schema_version)
+            found = data.get('metadata', {}).get(SCHEMA_VERSION_KEY)
+            if found != expected:
+                raise IncompatibleSchemaException(expected, found)
+
+        return super().from_dict(data=data, validate=validate)

core/dbt/deprecations.py

@@ -1,68 +1,138 @@
-import dbt.links
-import dbt.flags
+from typing import Optional, Set, List, Dict, ClassVar
+
+import dbt.exceptions
+from dbt import ui
+
+import dbt.tracking
 
 
-class DBTDeprecation(object):
-    name = None
-    description = None
+class DBTDeprecation:
+    _name: ClassVar[Optional[str]] = None
+    _description: ClassVar[Optional[str]] = None
 
-    def show(self, *args, **kwargs):
+    @property
+    def name(self) -> str:
+        if self._name is not None:
+            return self._name
+        raise NotImplementedError(
+            'name not implemented for {}'.format(self)
+        )
+
+    def track_deprecation_warn(self) -> None:
+        if dbt.tracking.active_user is not None:
+            dbt.tracking.track_deprecation_warn({
+                "deprecation_name": self.name
+            })
+
+    @property
+    def description(self) -> str:
+        if self._description is not None:
+            return self._description
+        raise NotImplementedError(
+            'description not implemented for {}'.format(self)
+        )
+
+    def show(self, *args, **kwargs) -> None:
         if self.name not in active_deprecations:
             desc = self.description.format(**kwargs)
-            dbt.exceptions.warn_or_error(
-                "* Deprecation Warning: {}\n".format(desc)
+            msg = ui.line_wrap_message(
+                desc, prefix='* Deprecation Warning: '
             )
+            dbt.exceptions.warn_or_error(msg)
+            self.track_deprecation_warn()
             active_deprecations.add(self.name)
 
 
-class DBTRepositoriesDeprecation(DBTDeprecation):
-    name = "repositories"
-    description = """The dbt_project.yml configuration option 'repositories' is
-  deprecated. Please place dependencies in the `packages.yml` file instead.
-  The 'repositories' option will be removed in a future version of dbt.
+class MaterializationReturnDeprecation(DBTDeprecation):
+    _name = 'materialization-return'
 
-  For more information, see: https://docs.getdbt.com/docs/package-management
-
-  # Example packages.yml contents:
-
-{recommendation}
-  """
+    _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.
 
 
-class GenerateSchemaNameSingleArgDeprecated(DBTDeprecation):
-    name = 'generate-schema-name-single-arg'
-    description = '''As of dbt v0.14.0, the `generate_schema_name` macro
-  accepts a second "node" argument. The one-argument form of `generate_schema_name`
-  is deprecated, and will become unsupported in a future release.
 
-  For more information, see:
-    https://docs.getdbt.com/v0.14/docs/upgrading-to-014
-  '''  # noqa
+    For more information, see:
+
+    https://docs.getdbt.com/v0.15/docs/creating-new-materializations#section-6-returning-relations
+    '''
 
 
-class ArchiveDeprecated(DBTDeprecation):
-    name = 'archives'
-    description = '''As of dbt v0.14.0, the `dbt archive` command is renamed to
-  `dbt snapshot` and "archives" are "snapshots". The `dbt archive` command will
-  be removed in a future release.
+class NotADictionaryDeprecation(DBTDeprecation):
+    _name = 'not-a-dictionary'
 
-  For more information, see:
-    https://docs.getdbt.com/v0.14/docs/upgrading-to-014
-  '''
+    _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}
+    '''
 
 
 _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.
- Documentation for {new_name} can be found here:
- https://docs.getdbt.com/docs/adapter"""
+a future release of dbt. Please use `adapter.{new_name}` instead.
+
+Documentation for {new_name} can be found here:
+
+    https://docs.getdbt.com/docs/adapter
+"""
 
 
-def renamed_method(old_name, new_name):
+def renamed_method(old_name: str, new_name: str):
+
     class AdapterDeprecationWarning(DBTDeprecation):
-        name = 'adapter:{}'.format(old_name)
-        description = _adapter_renamed_description.format(old_name=old_name,
-                                                          new_name=new_name)
+        _name = 'adapter:{}'.format(old_name)
+        _description = _adapter_renamed_description.format(old_name=old_name,
+                                                           new_name=new_name)
 
     dep = AdapterDeprecationWarning()
     deprecations_list.append(dep)
@@ -82,15 +152,20 @@ def warn(name, *args, **kwargs):
 # these are globally available
 # since modules are only imported once, active_deprecations is a singleton
 
-active_deprecations = set()
+active_deprecations: Set[str] = set()
 
-deprecations_list = [
-    DBTRepositoriesDeprecation(),
-    GenerateSchemaNameSingleArgDeprecated(),
-    ArchiveDeprecated(),
+deprecations_list: List[DBTDeprecation] = [
+    MaterializationReturnDeprecation(),
+    NotADictionaryDeprecation(),
+    ColumnQuotingDeprecation(),
+    ModelsKeyNonModelDeprecation(),
+    ExecuteMacrosReleaseDeprecation(),
+    AdapterMacroDeprecation(),
 ]
 
-deprecations = {d.name: d for d in deprecations_list}
+deprecations: Dict[str, DBTDeprecation] = {
+    d.name: d for d in deprecations_list
+}
 
 
 def reset_deprecations():

core/dbt/deps/base.py

@@ -0,0 +1,112 @@
+import abc
+import os
+import tempfile
+from contextlib import contextmanager
+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
+
+DOWNLOADS_PATH = None
+
+
+def get_downloads_path():
+    return DOWNLOADS_PATH
+
+
+@contextmanager
+def downloads_directory():
+    global DOWNLOADS_PATH
+    remove_downloads = False
+    # the user might have set an environment variable. Set it to that, and do
+    # not remove it when finished.
+    if DOWNLOADS_PATH is None:
+        DOWNLOADS_PATH = os.getenv('DBT_DOWNLOADS_DIR')
+        remove_downloads = False
+    # if we are making a per-run temp directory, remove it at the end of
+    # successful runs
+    if DOWNLOADS_PATH is None:
+        DOWNLOADS_PATH = tempfile.mkdtemp(prefix='dbt-downloads-')
+        remove_downloads = True
+
+    system.make_directory(DOWNLOADS_PATH)
+    logger.debug("Set downloads directory='{}'".format(DOWNLOADS_PATH))
+
+    yield DOWNLOADS_PATH
+
+    if remove_downloads:
+        system.rmtree(DOWNLOADS_PATH)
+        DOWNLOADS_PATH = None
+
+
+class BasePackage(metaclass=abc.ABCMeta):
+    @abc.abstractproperty
+    def name(self) -> str:
+        raise NotImplementedError
+
+    def all_names(self) -> List[str]:
+        return [self.name]
+
+    @abc.abstractmethod
+    def source_type(self) -> str:
+        raise NotImplementedError
+
+
+class PinnedPackage(BasePackage):
+    def __init__(self) -> None:
+        self._cached_metadata: Optional[ProjectPackageMetadata] = None
+
+    def __str__(self) -> str:
+        version = self.get_version()
+        if not version:
+            return self.name
+
+        return '{}@{}'.format(self.name, version)
+
+    @abc.abstractmethod
+    def get_version(self) -> Optional[str]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def _fetch_metadata(self, project, renderer):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def install(self, project):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def nice_version_name(self):
+        raise NotImplementedError
+
+    def fetch_metadata(self, project, renderer):
+        if not self._cached_metadata:
+            self._cached_metadata = self._fetch_metadata(project, renderer)
+        return self._cached_metadata
+
+    def get_project_name(self, project, renderer):
+        metadata = self.fetch_metadata(project, renderer)
+        return metadata.name
+
+    def get_installation_path(self, project, renderer):
+        dest_dirname = self.get_project_name(project, renderer)
+        return os.path.join(project.modules_path, dest_dirname)
+
+
+SomePinned = TypeVar('SomePinned', bound=PinnedPackage)
+SomeUnpinned = TypeVar('SomeUnpinned', bound='UnpinnedPackage')
+
+
+class UnpinnedPackage(Generic[SomePinned], BasePackage):
+    @abc.abstractclassmethod
+    def from_contract(cls, contract):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def incorporate(self: SomeUnpinned, other: SomeUnpinned) -> SomeUnpinned:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def resolved(self) -> SomePinned:
+        raise NotImplementedError

core/dbt/deps/git.py

@@ -0,0 +1,145 @@
+import os
+import hashlib
+from typing import List
+
+from dbt.clients import git, system
+from dbt.config import Project
+from dbt.contracts.project import (
+    ProjectPackageMetadata,
+    GitPackage,
+)
+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 import ui
+
+PIN_PACKAGE_URL = 'https://docs.getdbt.com/docs/package-management#section-specifying-package-versions' # noqa
+
+
+def md5sum(s: str):
+    return hashlib.md5(s.encode('latin-1')).hexdigest()
+
+
+class GitPackageMixin:
+    def __init__(self, git: str) -> None:
+        super().__init__()
+        self.git = git
+
+    @property
+    def name(self):
+        return self.git
+
+    def source_type(self) -> str:
+        return 'git'
+
+
+class GitPinnedPackage(GitPackageMixin, PinnedPackage):
+    def __init__(
+        self, git: str, revision: str, warn_unpinned: bool = True
+    ) -> None:
+        super().__init__(git)
+        self.revision = revision
+        self.warn_unpinned = warn_unpinned
+        self._checkout_name = md5sum(self.git)
+
+    def get_version(self):
+        return self.revision
+
+    def nice_version_name(self):
+        return 'revision {}'.format(self.revision)
+
+    def _checkout(self):
+        """Performs a shallow clone of the repository into the downloads
+        directory. This function can be called repeatedly. If the project has
+        already been checked out at this version, it will be a no-op. Returns
+        the path to the checked out directory."""
+        try:
+            dir_ = git.clone_and_checkout(
+                self.git, get_downloads_path(), branch=self.revision,
+                dirname=self._checkout_name
+            )
+        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'
+                )
+            raise
+        return os.path.join(get_downloads_path(), dir_)
+
+    def _fetch_metadata(self, project, renderer) -> ProjectPackageMetadata:
+        path = self._checkout()
+        if self.revision == 'master' and self.warn_unpinned:
+            warn_or_error(
+                'The git package "{}" is not pinned.\n\tThis can introduce '
+                'breaking changes into your project without warning!\n\nSee {}'
+                .format(self.git, PIN_PACKAGE_URL),
+                log_fmt=ui.yellow('WARNING: {}')
+            )
+        loaded = Project.from_project_root(path, renderer)
+        return ProjectPackageMetadata.from_project(loaded)
+
+    def install(self, project, renderer):
+        dest_path = self.get_installation_path(project, renderer)
+        if os.path.exists(dest_path):
+            if system.path_is_symlink(dest_path):
+                system.remove_file(dest_path)
+            else:
+                system.rmdir(dest_path)
+
+        system.move(self._checkout(), dest_path)
+
+
+class GitUnpinnedPackage(GitPackageMixin, UnpinnedPackage[GitPinnedPackage]):
+    def __init__(
+        self, git: str, revisions: List[str], warn_unpinned: bool = True
+    ) -> None:
+        super().__init__(git)
+        self.revisions = revisions
+        self.warn_unpinned = warn_unpinned
+
+    @classmethod
+    def from_contract(
+        cls, contract: GitPackage
+    ) -> 'GitUnpinnedPackage':
+        revisions = contract.get_revisions()
+
+        # we want to map None -> True
+        warn_unpinned = contract.warn_unpinned is not False
+        return cls(git=contract.git, revisions=revisions,
+                   warn_unpinned=warn_unpinned)
+
+    def all_names(self) -> List[str]:
+        if self.git.endswith('.git'):
+            other = self.git[:-4]
+        else:
+            other = self.git + '.git'
+        return [self.git, other]
+
+    def incorporate(
+        self, other: 'GitUnpinnedPackage'
+    ) -> 'GitUnpinnedPackage':
+        warn_unpinned = self.warn_unpinned and other.warn_unpinned
+
+        return GitUnpinnedPackage(
+            git=self.git,
+            revisions=self.revisions + other.revisions,
+            warn_unpinned=warn_unpinned,
+        )
+
+    def resolved(self) -> GitPinnedPackage:
+        requested = set(self.revisions)
+        if len(requested) == 0:
+            requested = {'master'}
+        elif len(requested) > 1:
+            raise_dependency_error(
+                'git dependencies should contain exactly one version. '
+                '{} contains: {}'.format(self.git, requested))
+
+        return GitPinnedPackage(
+            git=self.git, revision=requested.pop(),
+            warn_unpinned=self.warn_unpinned
+        )

core/dbt/deps/local.py

@@ -0,0 +1,84 @@
+import shutil
+
+from dbt.clients import system
+from dbt.deps.base import PinnedPackage, UnpinnedPackage
+from dbt.contracts.project import (
+    ProjectPackageMetadata,
+    LocalPackage,
+)
+from dbt.logger import GLOBAL_LOGGER as logger
+
+
+class LocalPackageMixin:
+    def __init__(self, local: str) -> None:
+        super().__init__()
+        self.local = local
+
+    @property
+    def name(self):
+        return self.local
+
+    def source_type(self):
+        return 'local'
+
+
+class LocalPinnedPackage(LocalPackageMixin, PinnedPackage):
+    def __init__(self, local: str) -> None:
+        super().__init__(local)
+
+    def get_version(self):
+        return None
+
+    def nice_version_name(self):
+        return '<local @ {}>'.format(self.local)
+
+    def resolve_path(self, project):
+        return system.resolve_path_from_base(
+            self.local,
+            project.project_root,
+        )
+
+    def _fetch_metadata(self, project, renderer):
+        loaded = project.from_project_root(
+            self.resolve_path(project), renderer
+        )
+        return ProjectPackageMetadata.from_project(loaded)
+
+    def install(self, project, renderer):
+        src_path = self.resolve_path(project)
+        dest_path = self.get_installation_path(project, renderer)
+
+        can_create_symlink = system.supports_symlinks()
+
+        if system.path_exists(dest_path):
+            if not system.path_is_symlink(dest_path):
+                system.rmdir(dest_path)
+            else:
+                system.remove_file(dest_path)
+
+        if can_create_symlink:
+            logger.debug('  Creating symlink to local dependency.')
+            system.make_symlink(src_path, dest_path)
+
+        else:
+            logger.debug('  Symlinks are not available on this '
+                         'OS, copying dependency.')
+            shutil.copytree(src_path, dest_path)
+
+
+class LocalUnpinnedPackage(
+    LocalPackageMixin, UnpinnedPackage[LocalPinnedPackage]
+):
+    @classmethod
+    def from_contract(
+        cls, contract: LocalPackage
+    ) -> 'LocalUnpinnedPackage':
+        return cls(local=contract.local)
+
+    def incorporate(
+        self, other: 'LocalUnpinnedPackage'
+    ) -> 'LocalUnpinnedPackage':
+        return LocalUnpinnedPackage(local=self.local)
+
+    def resolved(self) -> LocalPinnedPackage:
+        return LocalPinnedPackage(local=self.local)

core/dbt/deps/registry.py

@@ -0,0 +1,122 @@
+import os
+from typing import List
+
+from dbt import semver
+from dbt.clients import registry, system
+from dbt.contracts.project import (
+    RegistryPackageMetadata,
+    RegistryPackage,
+)
+from dbt.deps.base import PinnedPackage, UnpinnedPackage, get_downloads_path
+from dbt.exceptions import (
+    package_version_not_found,
+    VersionsNotCompatibleException,
+    DependencyException,
+    package_not_found,
+)
+
+
+class RegistryPackageMixin:
+    def __init__(self, package: str) -> None:
+        super().__init__()
+        self.package = package
+
+    @property
+    def name(self):
+        return self.package
+
+    def source_type(self) -> str:
+        return 'hub'
+
+
+class RegistryPinnedPackage(RegistryPackageMixin, PinnedPackage):
+    def __init__(self, package: str, version: str) -> None:
+        super().__init__(package)
+        self.version = version
+
+    @property
+    def name(self):
+        return self.package
+
+    def source_type(self):
+        return 'hub'
+
+    def get_version(self):
+        return self.version
+
+    def nice_version_name(self):
+        return 'version {}'.format(self.version)
+
+    def _fetch_metadata(self, project, renderer) -> RegistryPackageMetadata:
+        dct = registry.package_version(self.package, self.version)
+        return RegistryPackageMetadata.from_dict(dct)
+
+    def install(self, project, renderer):
+        metadata = self.fetch_metadata(project, renderer)
+
+        tar_name = '{}.{}.tar.gz'.format(self.package, self.version)
+        tar_path = os.path.realpath(
+            os.path.join(get_downloads_path(), tar_name)
+        )
+        system.make_directory(os.path.dirname(tar_path))
+
+        download_url = metadata.downloads.tarball
+        system.download(download_url, tar_path)
+        deps_path = project.modules_path
+        package_name = self.get_project_name(project, renderer)
+        system.untar_package(tar_path, deps_path, package_name)
+
+
+class RegistryUnpinnedPackage(
+    RegistryPackageMixin, UnpinnedPackage[RegistryPinnedPackage]
+):
+    def __init__(
+        self, package: str, versions: List[semver.VersionSpecifier]
+    ) -> None:
+        super().__init__(package)
+        self.versions = versions
+
+    def _check_in_index(self):
+        index = registry.index_cached()
+        if self.package not in index:
+            package_not_found(self.package)
+
+    @classmethod
+    def from_contract(
+        cls, contract: RegistryPackage
+    ) -> 'RegistryUnpinnedPackage':
+        raw_version = contract.get_versions()
+
+        versions = [
+            semver.VersionSpecifier.from_version_string(v)
+            for v in raw_version
+        ]
+        return cls(package=contract.package, versions=versions)
+
+    def incorporate(
+        self, other: 'RegistryUnpinnedPackage'
+    ) -> 'RegistryUnpinnedPackage':
+        return RegistryUnpinnedPackage(
+            package=self.package,
+            versions=self.versions + other.versions,
+        )
+
+    def resolved(self) -> RegistryPinnedPackage:
+        self._check_in_index()
+        try:
+            range_ = semver.reduce_versions(*self.versions)
+        except VersionsNotCompatibleException as e:
+            new_msg = ('Version error for package {}: {}'
+                       .format(self.name, e))
+            raise DependencyException(new_msg) from e
+
+        available = registry.get_available_versions(self.package)
+
+        # for now, pick a version and then recurse. later on,
+        # we'll probably want to traverse multiple options
+        # so we can match packages. not going to make a difference
+        # right now.
+        target = semver.resolve_to_specific_version(range_, available)
+        if not target:
+            package_version_not_found(self.package, range_, available)
+        return RegistryPinnedPackage(package=self.package, version=target)

core/dbt/deps/resolver.py

@@ -0,0 +1,143 @@
+from dataclasses import dataclass, field
+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
+from dbt.deps.local import LocalUnpinnedPackage
+from dbt.deps.git import GitUnpinnedPackage
+from dbt.deps.registry import RegistryUnpinnedPackage
+
+from dbt.contracts.project import (
+    LocalPackage,
+    GitPackage,
+    RegistryPackage,
+)
+
+PackageContract = Union[LocalPackage, GitPackage, RegistryPackage]
+
+
+@dataclass
+class PackageListing:
+    packages: Dict[str, UnpinnedPackage] = field(default_factory=dict)
+
+    def __len__(self):
+        return len(self.packages)
+
+    def __bool__(self):
+        return bool(self.packages)
+
+    def _pick_key(self, key: BasePackage) -> str:
+        for name in key.all_names():
+            if name in self.packages:
+                return name
+        return key.name
+
+    def __contains__(self, key: BasePackage):
+        for name in key.all_names():
+            if name in self.packages:
+                return True
+
+    def __getitem__(self, key: BasePackage):
+        key_str: str = self._pick_key(key)
+        return self.packages[key_str]
+
+    def __setitem__(self, key: BasePackage, value):
+        key_str: str = self._pick_key(key)
+        self.packages[key_str] = value
+
+    def _mismatched_types(
+        self, old: UnpinnedPackage, new: UnpinnedPackage
+    ) -> NoReturn:
+        raise_dependency_error(
+            f'Cannot incorporate {new} ({new.__class__.__name__}) in {old} '
+            f'({old.__class__.__name__}): mismatched types'
+        )
+
+    def incorporate(self, package: UnpinnedPackage):
+        key: str = self._pick_key(package)
+        if key in self.packages:
+            existing: UnpinnedPackage = self.packages[key]
+            if not isinstance(existing, type(package)):
+                self._mismatched_types(existing, package)
+            self.packages[key] = existing.incorporate(package)
+        else:
+            self.packages[key] = package
+
+    def update_from(self, src: List[PackageContract]) -> None:
+        pkg: UnpinnedPackage
+        for contract in src:
+            if isinstance(contract, LocalPackage):
+                pkg = LocalUnpinnedPackage.from_contract(contract)
+            elif isinstance(contract, GitPackage):
+                pkg = GitUnpinnedPackage.from_contract(contract)
+            elif isinstance(contract, RegistryPackage):
+                pkg = RegistryUnpinnedPackage.from_contract(contract)
+            else:
+                raise InternalException(
+                    'Invalid package type {}'.format(type(contract))
+                )
+            self.incorporate(pkg)
+
+    @classmethod
+    def from_contracts(
+        cls: Type['PackageListing'], src: List[PackageContract]
+    ) -> 'PackageListing':
+        self = cls({})
+        self.update_from(src)
+        return self
+
+    def resolved(self) -> List[PinnedPackage]:
+        return [p.resolved() for p in self.packages.values()]
+
+    def __iter__(self) -> Iterator[UnpinnedPackage]:
+        return iter(self.packages.values())
+
+
+def _check_for_duplicate_project_names(
+    final_deps: List[PinnedPackage],
+    config: Project,
+    renderer: DbtProjectYamlRenderer,
+):
+    seen: Set[str] = set()
+    for package in final_deps:
+        project_name = package.get_project_name(config, renderer)
+        if project_name in seen:
+            raise_dependency_error(
+                f'Found duplicate project "{project_name}". This occurs when '
+                'a dependency has the same project name as some other '
+                'dependency.'
+            )
+        elif project_name == config.project_name:
+            raise_dependency_error(
+                'Found a dependency with the same name as the root project '
+                f'"{project_name}". Package names must be unique in a project.'
+                ' Please rename one of these packages.'
+            )
+        seen.add(project_name)
+
+
+def resolve_packages(
+    packages: List[PackageContract], config: RuntimeConfig
+) -> List[PinnedPackage]:
+    pending = PackageListing.from_contracts(packages)
+    final = PackageListing()
+
+    ctx = generate_target_context(config, config.cli_vars)
+    renderer = DbtProjectYamlRenderer(ctx)
+
+    while pending:
+        next_pending = PackageListing()
+        # resolve the dependency in question
+        for package in pending:
+            final.incorporate(package)
+            target = final[package].resolved().fetch_metadata(config, renderer)
+            next_pending.update_from(target.packages)
+        pending = next_pending
+
+    resolved = final.resolved()
+    _check_for_duplicate_project_names(resolved, config, renderer)
+    return resolved

core/dbt/exceptions.py

@@ -1,10 +1,23 @@
-import sys
-import six
+import builtins
 import functools
+from typing import NoReturn, Optional, Mapping, Any
 
-from dbt.compat import builtins
 from dbt.logger import GLOBAL_LOGGER as logger
-import dbt.flags
+from dbt.node_types import NodeType
+from dbt import flags
+from dbt.ui import line_wrap_message
+
+import hologram
+
+
+def validator_error_message(exc):
+    """Given a hologram.ValidationError (which is basically a
+    jsonschema.ValidationError), return the relevant parts as a string
+    """
+    if not isinstance(exc, hologram.ValidationError):
+        return str(exc)
+    path = "[%s]" % "][".join(map(repr, exc.relative_path))
+    return 'at path {}: {}'.format(path, exc.message)
 
 
 class Exception(builtins.Exception):
@@ -41,6 +54,12 @@ class RuntimeException(RuntimeError, Exception):
         self.node = node
         self.msg = msg
 
+    def add_node(self, node=None):
+        if node is not None and node is not self.node:
+            if self.node is not None:
+                self.stack.append(self.node)
+            self.node = node
+
     @property
     def type(self):
         return 'Runtime'
@@ -48,11 +67,22 @@ class RuntimeException(RuntimeError, Exception):
     def node_to_string(self, node):
         if node is None:
             return "<Unknown>"
+        if not hasattr(node, 'name'):
+            # we probably failed to parse a block, so we can't know the name
+            return '{} ({})'.format(
+                node.resource_type,
+                node.original_file_path
+            )
 
+        if hasattr(node, 'contents'):
+            # handle FileBlocks. They aren't really nodes but we want to render
+            # out the path we know at least. This indicates an error during
+            # block parsing.
+            return '{}'.format(node.path.original_file_path)
         return "{} {} ({})".format(
-            node.get('resource_type'),
-            node.get('name', 'unknown'),
-            node.get('original_file_path'))
+            node.resource_type,
+            node.name,
+            node.original_file_path)
 
     def process_stack(self):
         lines = []
@@ -84,7 +114,6 @@ class RuntimeException(RuntimeError, Exception):
         if hasattr(self.msg, 'split'):
             split_msg = self.msg.split("\n")
         else:
-            # can't use basestring here, as on python2 it's an abstract class
             split_msg = str(self.msg).split("\n")
 
         lines = ["{}{}".format(self.type + ' Error',
@@ -101,8 +130,9 @@ class RuntimeException(RuntimeError, Exception):
             return result
 
         result.update({
-            'raw_sql': self.node.get('raw_sql'),
-            'compiled_sql': self.node.get('injected_sql'),
+            'raw_sql': self.node.raw_sql,
+            # the node isn't always compiled, but if it is, include that!
+            'compiled_sql': getattr(self.node, 'compiled_sql', None),
         })
         return result
 
@@ -117,11 +147,11 @@ class RPCTimeoutException(RuntimeException):
     MESSAGE = 'RPC timeout error'
 
     def __init__(self, timeout):
-        super(RPCTimeoutException, self).__init__(self.MESSAGE)
+        super().__init__(self.MESSAGE)
         self.timeout = timeout
 
     def data(self):
-        result = super(RPCTimeoutException, self).data()
+        result = super().data()
         result.update({
             'timeout': self.timeout,
             'message': 'RPC timed out after {}s'.format(self.timeout),
@@ -136,7 +166,7 @@ class RPCKilledException(RuntimeException):
     def __init__(self, signum):
         self.signum = signum
         self.message = 'RPC process killed by signal {}'.format(self.signum)
-        super(RPCKilledException, self).__init__(self.message)
+        super().__init__(self.message)
 
     def data(self):
         return {
@@ -145,6 +175,38 @@ class RPCKilledException(RuntimeException):
         }
 
 
+class RPCCompiling(RuntimeException):
+    CODE = 10010
+    MESSAGE = (
+        'RPC server is compiling the project, call the "status" method for'
+        ' compile status'
+    )
+
+    def __init__(self, msg=None, node=None):
+        if msg is None:
+            msg = 'compile in progress'
+        super().__init__(msg, node)
+
+
+class RPCLoadException(RuntimeException):
+    CODE = 10011
+    MESSAGE = (
+        'RPC server failed to compile project, call the "status" method for'
+        ' compile status'
+    )
+
+    def __init__(self, cause):
+        self.cause = cause
+        self.message = '{}: {}'.format(self.MESSAGE, self.cause['message'])
+        super().__init__(self.message)
+
+    def data(self):
+        return {
+            'cause': self.cause,
+            'message': self.message
+        }
+
+
 class DatabaseException(RuntimeException):
     CODE = 10003
     MESSAGE = "Database Error"
@@ -152,9 +214,8 @@ class DatabaseException(RuntimeException):
     def process_stack(self):
         lines = []
 
-        if self.node is not None and self.node.get('build_path'):
-            lines.append(
-                "compiled SQL at {}".format(self.node.get('build_path')))
+        if hasattr(self.node, 'build_path') and self.node.build_path:
+            lines.append("compiled SQL at {}".format(self.node.build_path))
 
         return lines + RuntimeException.process_stack(self)
 
@@ -189,13 +250,56 @@ class JSONValidationException(ValidationException):
         msg = 'Invalid arguments passed to "{}" instance: {}'.format(
             self.typename, self.errors_message
         )
-        super(JSONValidationException, self).__init__(msg)
+        super().__init__(msg)
 
     def __reduce__(self):
         # see https://stackoverflow.com/a/36342588 for why this is necessary
         return (JSONValidationException, (self.typename, self.errors))
 
 
+class IncompatibleSchemaException(RuntimeException):
+    def __init__(self, expected: str, found: Optional[str]):
+        self.expected = expected
+        self.found = found
+        self.filename = 'input file'
+
+        super().__init__(self.get_message())
+
+    def add_filename(self, filename: str):
+        self.filename = filename
+        self.msg = self.get_message()
+
+    def get_message(self) -> str:
+        found_str = 'nothing'
+        if self.found is not None:
+            found_str = f'"{self.found}"'
+
+        msg = (
+            f'Expected a schema version of "{self.expected}" in '
+            f'{self.filename}, but found {found_str}. Are you running with a '
+            f'different version of dbt?'
+        )
+        return msg
+
+    CODE = 10014
+    MESSAGE = "Incompatible Schema"
+
+
+class JinjaRenderingException(CompilationException):
+    pass
+
+
+class UnknownAsyncIDException(Exception):
+    CODE = 10012
+    MESSAGE = 'RPC server got an unknown async ID'
+
+    def __init__(self, task_id):
+        self.task_id = task_id
+
+    def __str__(self):
+        return '{}: {}'.format(self.MESSAGE, self.task_id)
+
+
 class AliasException(ValidationException):
     pass
 
@@ -210,16 +314,43 @@ class DbtConfigError(RuntimeException):
     CODE = 10007
     MESSAGE = "DBT Configuration Error"
 
-    def __init__(self, message, project=None, result_type='invalid_project'):
+    def __init__(
+        self, message, project=None, result_type='invalid_project', path=None
+    ):
         self.project = project
-        super(DbtConfigError, self).__init__(message)
+        super().__init__(message)
         self.result_type = result_type
+        self.path = path
+
+    def __str__(self, prefix='! ') -> str:
+        msg = super().__str__(prefix)
+        if self.path is None:
+            return msg
+        else:
+            return f'{msg}\n\nError encountered in {self.path}'
+
+
+class FailFastException(RuntimeException):
+    CODE = 10013
+    MESSAGE = 'FailFast Error'
+
+    def __init__(self, message, result=None, node=None):
+        super().__init__(msg=message, node=node)
+        self.result = result
+
+    @property
+    def type(self):
+        return 'FailFast'
 
 
 class DbtProjectError(DbtConfigError):
     pass
 
 
+class DbtSelectorsError(DbtConfigError):
+    pass
+
+
 class DbtProfileError(DbtConfigError):
     pass
 
@@ -228,7 +359,9 @@ class SemverException(Exception):
     def __init__(self, msg=None):
         self.msg = msg
         if msg is not None:
-            super(SemverException, self).__init__(msg)
+            super().__init__(msg)
+        else:
+            super().__init__()
 
 
 class VersionsNotCompatibleException(SemverException):
@@ -245,7 +378,7 @@ class FailedToConnectException(DatabaseException):
 
 class CommandError(RuntimeException):
     def __init__(self, cwd, cmd, message='Error running command'):
-        super(CommandError, self).__init__(message)
+        super().__init__(message)
         self.cwd = cwd
         self.cmd = cmd
         self.args = (cwd, cmd, message)
@@ -258,12 +391,12 @@ class CommandError(RuntimeException):
 
 class ExecutableError(CommandError):
     def __init__(self, cwd, cmd, message):
-        super(ExecutableError, self).__init__(cwd, cmd, message)
+        super().__init__(cwd, cmd, message)
 
 
 class WorkingDirectoryError(CommandError):
     def __init__(self, cwd, cmd, message):
-        super(WorkingDirectoryError, self).__init__(cwd, cmd, message)
+        super().__init__(cwd, cmd, message)
 
     def __str__(self):
         return '{}: "{}"'.format(self.msg, self.cwd)
@@ -272,7 +405,7 @@ class WorkingDirectoryError(CommandError):
 class CommandResultError(CommandError):
     def __init__(self, cwd, cmd, returncode, stdout, stderr,
                  message='Got a non-zero returncode'):
-        super(CommandResultError, self).__init__(cwd, cmd, message)
+        super().__init__(cwd, cmd, message)
         self.returncode = returncode
         self.stdout = stdout
         self.stderr = stderr
@@ -282,20 +415,36 @@ class CommandResultError(CommandError):
         return '{} running: {}'.format(self.msg, self.cmd)
 
 
-def raise_compiler_error(msg, node=None):
+class InvalidConnectionException(RuntimeException):
+    def __init__(self, thread_id, known, node=None):
+        self.thread_id = thread_id
+        self.known = known
+        super().__init__(
+            msg='connection never acquired for thread {}, have {}'
+            .format(self.thread_id, self.known)
+        )
+
+
+class InvalidSelectorException(RuntimeException):
+    def __init__(self, name: str):
+        self.name = name
+        super().__init__(name)
+
+
+def raise_compiler_error(msg, node=None) -> NoReturn:
     raise CompilationException(msg, node)
 
 
-def raise_database_error(msg, node=None):
+def raise_database_error(msg, node=None) -> NoReturn:
     raise DatabaseException(msg, node)
 
 
-def raise_dependency_error(msg):
+def raise_dependency_error(msg) -> NoReturn:
     raise DependencyException(msg)
 
 
 def invalid_type_error(method_name, arg_name, got_value, expected_type,
-                       version='0.13.0'):
+                       version='0.13.0') -> NoReturn:
     """Raise a CompilationException when an adapter method available to macros
     has changed.
     """
@@ -308,13 +457,13 @@ def invalid_type_error(method_name, arg_name, got_value, expected_type,
                          got_value=got_value, got_type=got_type))
 
 
-def ref_invalid_args(model, args):
+def ref_invalid_args(model, args) -> NoReturn:
     raise_compiler_error(
         "ref() takes at most two arguments ({} given)".format(len(args)),
         model)
 
 
-def ref_bad_context(model, args):
+def ref_bad_context(model, args) -> NoReturn:
     ref_args = ', '.join("'{}'".format(a) for a in args)
     ref_string = '{{{{ ref({}) }}}}'.format(ref_args)
 
@@ -328,21 +477,29 @@ To fix this, add the following hint to the top of the model "{model_name}":
     # better error messages. Ex. If models foo_users and bar_users are aliased
     # to 'users', in their respective schemas, then you would want to see
     # 'bar_users' in your error messge instead of just 'users'.
+    if isinstance(model, dict):  # TODO: remove this path
+        model_name = model['name']
+        model_path = model['path']
+    else:
+        model_name = model.name
+        model_path = model.path
     error_msg = base_error_msg.format(
-        model_name=model['name'],
-        model_path=model['path'],
+        model_name=model_name,
+        model_path=model_path,
         ref_string=ref_string
     )
     raise_compiler_error(error_msg, model)
 
 
-def doc_invalid_args(model, args):
+def doc_invalid_args(model, args) -> NoReturn:
     raise_compiler_error(
         "doc() takes at most two arguments ({} given)".format(len(args)),
         model)
 
 
-def doc_target_not_found(model, target_doc_name, target_doc_package):
+def doc_target_not_found(
+    model, target_doc_name: str, target_doc_package: Optional[str]
+) -> NoReturn:
     target_package_string = ''
 
     if target_doc_package is not None:
@@ -351,83 +508,107 @@ def doc_target_not_found(model, target_doc_name, target_doc_package):
     msg = (
         "Documentation for '{}' depends on doc '{}' {} which was not found"
     ).format(
-        model.get('unique_id'),
+        model.unique_id,
         target_doc_name,
         target_package_string
     )
     raise_compiler_error(msg, model)
 
 
-def _get_target_failure_msg(model, target_model_name, target_model_package,
-                            include_path, reason):
+def _get_target_failure_msg(
+    model, target_name: str, target_model_package: Optional[str],
+    include_path: bool, reason: str, target_kind: str
+) -> str:
     target_package_string = ''
     if target_model_package is not None:
         target_package_string = "in package '{}' ".format(target_model_package)
 
     source_path_string = ''
     if include_path:
-        source_path_string = ' ({})'.format(model.get('original_file_path'))
+        source_path_string = ' ({})'.format(model.original_file_path)
 
-    return ("{} '{}'{} depends on model '{}' {}which {}"
-            .format(model.get('resource_type').title(),
-                    model.get('unique_id'),
-                    source_path_string,
-                    target_model_name,
-                    target_package_string,
-                    reason))
+    return "{} '{}'{} depends on a {} named '{}' {}which {}".format(
+        model.resource_type.title(),
+        model.unique_id,
+        source_path_string,
+        target_kind,
+        target_name,
+        target_package_string,
+        reason
+    )
 
 
-def get_target_disabled_msg(model, target_model_name, target_model_package):
-    return _get_target_failure_msg(model, target_model_name,
-                                   target_model_package, include_path=True,
-                                   reason='is disabled')
+def get_target_not_found_or_disabled_msg(
+    model, target_model_name: str, target_model_package: Optional[str],
+    disabled: Optional[bool] = None,
+) -> str:
+    if disabled is None:
+        reason = 'was not found or is disabled'
+    elif disabled is True:
+        reason = 'is disabled'
+    else:
+        reason = 'was not found'
+    return _get_target_failure_msg(
+        model, target_model_name, target_model_package, include_path=True,
+        reason=reason, target_kind='node'
+    )
 
 
-def get_target_not_found_msg(model, target_model_name, target_model_package):
-    return _get_target_failure_msg(model, target_model_name,
-                                   target_model_package, include_path=True,
-                                   reason='was not found')
-
-
-def get_target_not_found_or_disabled_msg(model, target_model_name,
-                                         target_model_package):
-    return _get_target_failure_msg(model, target_model_name,
-                                   target_model_package, include_path=False,
-                                   reason='was not found or is disabled')
-
-
-def ref_target_not_found(model, target_model_name, target_model_package):
-    msg = get_target_not_found_or_disabled_msg(model, target_model_name,
-                                               target_model_package)
+def ref_target_not_found(
+    model,
+    target_model_name: str,
+    target_model_package: Optional[str],
+    disabled: Optional[bool] = None,
+) -> NoReturn:
+    msg = get_target_not_found_or_disabled_msg(
+        model, target_model_name, target_model_package, disabled
+    )
     raise_compiler_error(msg, model)
 
 
-def source_disabled_message(model, target_name, target_table_name):
-    return ("{} '{}' ({}) depends on source '{}.{}' which was not found"
-            .format(model.get('resource_type').title(),
-                    model.get('unique_id'),
-                    model.get('original_file_path'),
-                    target_name,
-                    target_table_name))
+def get_source_not_found_or_disabled_msg(
+    model,
+    target_name: str,
+    target_table_name: str,
+    disabled: Optional[bool] = None,
+) -> str:
+    full_name = f'{target_name}.{target_table_name}'
+    if disabled is None:
+        reason = 'was not found or is disabled'
+    elif disabled is True:
+        reason = 'is disabled'
+    else:
+        reason = 'was not found'
+    return _get_target_failure_msg(
+        model, full_name, None, include_path=True,
+        reason=reason, target_kind='source'
+    )
 
 
-def source_target_not_found(model, target_name, target_table_name):
-    msg = source_disabled_message(model, target_name, target_table_name)
+def source_target_not_found(
+    model,
+    target_name: str,
+    target_table_name: str,
+    disabled: Optional[bool] = None
+) -> NoReturn:
+    msg = get_source_not_found_or_disabled_msg(
+        model, target_name, target_table_name, disabled
+    )
     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.get('unique_id'),
-                                    target_model.get('unique_id')),
+        "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!"
-        .format(model.get('unique_id'), target_model_name),
+        .format(model.unique_id, target_model_name),
         model)
 
 
@@ -435,12 +616,11 @@ def macro_not_found(model, target_macro_id):
     raise_compiler_error(
         model,
         "'{}' references macro '{}' which is not defined!"
-        .format(model.get('unique_id'), target_macro_id))
+        .format(model.unique_id, target_macro_id))
 
 
 def materialization_not_available(model, adapter_type):
-    from dbt.utils import get_materialization  # noqa
-    materialization = get_materialization(model)
+    materialization = model.get_materialization()
 
     raise_compiler_error(
         "Materialization '{}' is not available for {}!"
@@ -449,8 +629,7 @@ def materialization_not_available(model, adapter_type):
 
 
 def missing_materialization(model, adapter_type):
-    from dbt.utils import get_materialization  # noqa
-    materialization = get_materialization(model)
+    materialization = model.get_materialization()
 
     valid_types = "'default'"
 
@@ -476,7 +655,7 @@ def raise_cache_inconsistent(message):
 def missing_config(model, name):
     raise_compiler_error(
         "Model '{}' does not define a required config parameter '{}'."
-        .format(model.get('unique_id'), name),
+        .format(model.unique_id, name),
         model)
 
 
@@ -559,31 +738,67 @@ def approximate_relation_match(target, relation):
                 relation=relation))
 
 
+def raise_duplicate_macro_name(node_1, node_2, namespace) -> NoReturn:
+    duped_name = node_1.name
+    if node_1.package_name != node_2.package_name:
+        extra = (
+            ' ("{}" and "{}" are both in the "{}" namespace)'
+            .format(node_1.package_name, node_2.package_name, namespace)
+        )
+    else:
+        extra = ''
+
+    raise_compiler_error(
+        'dbt found two macros with the name "{}" in the namespace "{}"{}. '
+        'Since these macros have the same name and exist in the same '
+        'namespace, dbt will be unable to decide which to call. To fix this, '
+        'change the name of one of these macros:\n- {} ({})\n- {} ({})'
+        .format(
+            duped_name, namespace, extra,
+            node_1.unique_id, node_1.original_file_path,
+            node_2.unique_id, node_2.original_file_path
+        )
+    )
+
+
 def raise_duplicate_resource_name(node_1, node_2):
-    duped_name = node_1['name']
+    duped_name = node_1.name
+
+    if node_1.resource_type in NodeType.refable():
+        get_func = 'ref("{}")'.format(duped_name)
+    elif node_1.resource_type == NodeType.Source:
+        duped_name = node_1.get_full_source_name()
+        get_func = node_1.get_source_representation()
+    elif node_1.resource_type == NodeType.Documentation:
+        get_func = 'doc("{}")'.format(duped_name)
+    elif node_1.resource_type == NodeType.Test and 'schema' in node_1.tags:
+        return
+    else:
+        get_func = '"{}"'.format(duped_name)
 
     raise_compiler_error(
         'dbt found two resources with the name "{}". Since these resources '
         'have the same name,\ndbt will be unable to find the correct resource '
-        'when ref("{}") is used. To fix this,\nchange the name of one of '
+        'when {} is used. To fix this,\nchange the name of one of '
         'these resources:\n- {} ({})\n- {} ({})'.format(
             duped_name,
-            duped_name,
-            node_1['unique_id'], node_1['original_file_path'],
-            node_2['unique_id'], node_2['original_file_path']))
+            get_func,
+            node_1.unique_id, node_1.original_file_path,
+            node_2.unique_id, node_2.original_file_path))
 
 
-def raise_ambiguous_alias(node_1, node_2):
-    duped_name = "{}.{}".format(node_1['schema'], node_1['alias'])
+def raise_ambiguous_alias(node_1, node_2, duped_name=None):
+    if duped_name is None:
+        duped_name = f"{node_1.database}.{node_1.schema}.{node_1.alias}"
 
     raise_compiler_error(
         'dbt found two resources with the database representation "{}".\ndbt '
         'cannot create two resources with identical database representations. '
-        'To fix this,\nchange the "schema" or "alias" configuration of one of '
-        'these resources:\n- {} ({})\n- {} ({})'.format(
+        'To fix this,\nchange the configuration of one of these resources:'
+        '\n- {} ({})\n- {} ({})'.format(
             duped_name,
-            node_1['unique_id'], node_1['original_file_path'],
-            node_2['unique_id'], node_2['original_file_path']))
+            node_1.unique_id, node_1.original_file_path,
+            node_2.unique_id, node_2.original_file_path))
 
 
 def raise_ambiguous_catalog_match(unique_id, match_1, match_2):
@@ -617,15 +832,62 @@ def raise_patch_targets_not_found(patches):
     )
 
 
-def raise_duplicate_patch_name(name, patch_1, patch_2):
-    raise_compiler_error(
-        'dbt found two schema.yml entries for the same model named {}. The '
-        'first patch was specified in {} and the second in {}. Models and '
-        'their associated columns may only be described a single time.'.format(
-            name,
-            patch_1,
-            patch_2,
+def _fix_dupe_msg(path_1: str, path_2: str, name: str, type_name: str) -> str:
+    if path_1 == path_2:
+        return (
+            f'remove one of the {type_name} entries for {name} in this file:\n'
+            f' - {path_1!s}\n'
         )
+    else:
+        return (
+            f'remove the {type_name} entry for {name} in one of these files:\n'
+            f' - {path_1!s}\n{path_2!s}'
+        )
+
+
+def raise_duplicate_patch_name(patch_1, patch_2):
+    name = patch_1.name
+    fix = _fix_dupe_msg(
+        patch_1.original_file_path,
+        patch_2.original_file_path,
+        name,
+        'resource',
+    )
+    raise_compiler_error(
+        f'dbt found two schema.yml entries for the same resource named '
+        f'{name}. Resources and their associated columns may only be '
+        f'described a single time. To fix this, {fix}'
+    )
+
+
+def raise_duplicate_macro_patch_name(patch_1, patch_2):
+    package_name = patch_1.package_name
+    name = patch_1.name
+    fix = _fix_dupe_msg(
+        patch_1.original_file_path,
+        patch_2.original_file_path,
+        name,
+        'macros'
+    )
+    raise_compiler_error(
+        f'dbt found two schema.yml entries for the same macro in package '
+        f'{package_name} named {name}. Macros may only be described a single '
+        f'time. To fix this, {fix}'
+    )
+
+
+def raise_duplicate_source_patch_name(patch_1, patch_2):
+    name = f'{patch_1.overrides}.{patch_1.name}'
+    fix = _fix_dupe_msg(
+        patch_1.path,
+        patch_2.path,
+        name,
+        'sources',
+    )
+    raise_compiler_error(
+        f'dbt found two schema.yml entries for the same source named '
+        f'{patch_1.name} in package {patch_1.overrides}. Sources may only be '
+        f'overridden a single time. To fix this, {fix}'
     )
 
 
@@ -645,12 +907,46 @@ def raise_unrecognized_credentials_type(typename, supported_types):
     )
 
 
+def raise_invalid_patch(
+    node, patch_section: str, patch_path: str,
+) -> NoReturn:
+    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.
+        '''
+    )
+    raise_compiler_error(msg, node)
+
+
 def raise_not_implemented(msg):
-    raise NotImplementedException(msg)
+    raise NotImplementedException(
+        "ERROR: {}"
+        .format(msg))
+
+
+def raise_duplicate_alias(
+    kwargs: Mapping[str, Any], aliases: Mapping[str, str], canonical_key: str
+) -> NoReturn:
+    # dupe found: go through the dict so we can have a nice-ish error
+    key_names = ', '.join(
+        "{}".format(k) for k in kwargs if
+        aliases.get(k) == canonical_key
+    )
+
+    raise AliasException(
+        f'Got duplicate keys: ({key_names}) all map to "{canonical_key}"'
+    )
 
 
 def warn_or_error(msg, node=None, log_fmt=None):
-    if dbt.flags.WARN_ERROR:
+    if flags.WARN_ERROR:
         raise_compiler_error(msg, node)
     else:
         if log_fmt is not None:
@@ -659,7 +955,7 @@ def warn_or_error(msg, node=None, log_fmt=None):
 
 
 def warn_or_raise(exc, log_fmt=None):
-    if dbt.flags.WARN_ERROR:
+    if flags.WARN_ERROR:
         raise exc
     else:
         msg = str(exc)
@@ -668,12 +964,20 @@ def warn_or_raise(exc, log_fmt=None):
         logger.warning(msg)
 
 
+def warn(msg, node=None):
+    # there's no reason to expose log_fmt to macros - it's only useful for
+    # handling colors
+    warn_or_error(msg, node=node)
+    return ""
+
+
 # Update this when a new function should be added to the
 # dbt context's `exceptions` key!
 CONTEXT_EXPORTS = {
     fn.__name__: fn
     for fn in
     [
+        warn,
         missing_config,
         missing_materialization,
         missing_relation,
@@ -687,6 +991,7 @@ CONTEXT_EXPORTS = {
         raise_duplicate_patch_name,
         raise_duplicate_resource_name,
         raise_invalid_schema_yml_version,
+        raise_not_implemented,
         relation_wrong_type,
     ]
 }
@@ -698,12 +1003,9 @@ def wrapper(model):
         def inner(*args, **kwargs):
             try:
                 return func(*args, **kwargs)
-            except Exception:
-                exc_type, exc, exc_tb = sys.exc_info()
-                if hasattr(exc, 'node') and exc.node is None:
-                    exc.node = model
-                six.reraise(exc_type, exc, exc_tb)
-
+            except RuntimeException as exc:
+                exc.add_node(model)
+                raise exc
         return inner
     return wrap
 

core/dbt/flags.py

@@ -1,29 +1,96 @@
-STRICT_MODE = False
-FULL_REFRESH = False
-USE_CACHE = True
-WARN_ERROR = False
-TEST_NEW_PARSER = False
+import os
+import multiprocessing
+if os.name != 'nt':
+    # https://bugs.python.org/issue41567
+    import multiprocessing.popen_spawn_posix  # type: ignore
+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
+WRITE_JSON = None
+PARTIAL_PARSE = None
+USE_COLORS = None
+
+
+def env_set_truthy(key: str) -> Optional[str]:
+    """Return the value if it was set to a "truthy" string value, or None
+    otherwise.
+    """
+    value = os.getenv(key)
+    if not value or value.lower() in ('0', 'false', 'f'):
+        return None
+    return value
+
+
+def env_set_path(key: str) -> Optional[Path]:
+    value = os.getenv(key)
+    if value is None:
+        return value
+    else:
+        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')
+
+
+def _get_context():
+    # TODO: change this back to use fork() on linux when we have made that safe
+    return multiprocessing.get_context('spawn')
+
+
+MP_CONTEXT = _get_context()
 
 
 def reset():
-    global STRICT_MODE, FULL_REFRESH, USE_CACHE, WARN_ERROR, TEST_NEW_PARSER
+    global STRICT_MODE, FULL_REFRESH, USE_CACHE, WARN_ERROR, TEST_NEW_PARSER, \
+        WRITE_JSON, PARTIAL_PARSE, MP_CONTEXT, USE_COLORS
 
     STRICT_MODE = False
     FULL_REFRESH = False
     USE_CACHE = True
     WARN_ERROR = False
     TEST_NEW_PARSER = False
+    WRITE_JSON = True
+    PARTIAL_PARSE = False
+    MP_CONTEXT = _get_context()
+    USE_COLORS = True
 
 
 def set_from_args(args):
-    global STRICT_MODE, FULL_REFRESH, USE_CACHE, WARN_ERROR, TEST_NEW_PARSER
-    USE_CACHE = getattr(args, 'use_cache', True)
+    global STRICT_MODE, FULL_REFRESH, USE_CACHE, WARN_ERROR, TEST_NEW_PARSER, \
+        WRITE_JSON, PARTIAL_PARSE, MP_CONTEXT, USE_COLORS
 
-    FULL_REFRESH = getattr(args, 'full_refresh', False)
-    STRICT_MODE = getattr(args, 'strict', False)
+    USE_CACHE = getattr(args, 'use_cache', USE_CACHE)
+
+    FULL_REFRESH = getattr(args, 'full_refresh', FULL_REFRESH)
+    STRICT_MODE = getattr(args, 'strict', STRICT_MODE)
     WARN_ERROR = (
         STRICT_MODE or
-        getattr(args, 'warn_error', False)
+        getattr(args, 'warn_error', STRICT_MODE or WARN_ERROR)
     )
 
-    TEST_NEW_PARSER = getattr(args, 'test_new_parser', False)
+    TEST_NEW_PARSER = getattr(args, 'test_new_parser', TEST_NEW_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
+
+
+# initialize everything to the defaults on module load
+reset()

core/dbt/graph/__init__.py

@@ -0,0 +1,18 @@
+from .selector_spec import (  # noqa: F401
+    SelectionUnion,
+    SelectionSpec,
+    SelectionIntersection,
+    SelectionDifference,
+    SelectionCriteria,
+)
+from .selector import (  # noqa: F401
+    ResourceTypeSelector,
+    NodeSelector,
+)
+from .cli import (  # noqa: F401
+    parse_difference,
+    parse_test_selectors,
+    parse_from_selectors_definition,
+)
+from .queue import GraphQueue  # noqa: F401
+from .graph import Graph, UniqueId  # noqa: F401

core/dbt/graph/cli.py

@@ -0,0 +1,281 @@
+# special support for CLI argument parsing.
+import itertools
+import yaml
+
+from typing import (
+    Dict, List, Optional, Tuple, Any, Union
+)
+
+from dbt.contracts.selection import SelectorDefinition, SelectorFile
+from dbt.exceptions import InternalException, ValidationException
+
+from .selector_spec import (
+    SelectionUnion,
+    SelectionSpec,
+    SelectionIntersection,
+    SelectionDifference,
+    SelectionCriteria,
+)
+
+INTERSECTION_DELIMITER = ','
+
+DEFAULT_INCLUDES: List[str] = ['fqn:*', 'source:*', 'exposure:*']
+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
+) -> SelectionUnion:
+    # turn ['a b', 'c'] -> ['a', 'b', 'c']
+    raw_specs = itertools.chain.from_iterable(
+        r.split(' ') for r in components
+    )
+    union_components: List[SelectionSpec] = []
+
+    # ['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)
+            for part in raw_spec.split(INTERSECTION_DELIMITER)
+        ]
+        union_components.append(SelectionIntersection(
+            components=intersection_components,
+            expect_exists=expect_exists,
+            raw=raw_spec,
+        ))
+
+    return SelectionUnion(
+        components=union_components,
+        expect_exists=False,
+        raw=components,
+    )
+
+
+def parse_union_from_default(
+    raw: Optional[List[str]], default: List[str]
+) -> SelectionUnion:
+    components: List[str]
+    expect_exists: bool
+    if raw is None:
+        return parse_union(components=default, expect_exists=False)
+    else:
+        return parse_union(components=raw, expect_exists=True)
+
+
+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)
+    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
+    )
+
+
+RawDefinition = Union[str, Dict[str, Any]]
+
+
+def _get_list_dicts(
+    dct: Dict[str, Any], key: str
+) -> List[RawDefinition]:
+    result: List[RawDefinition] = []
+    if key not in dct:
+        raise InternalException(
+            f'Expected to find key {key} in dict, only found {list(dct)}'
+        )
+    values = dct[key]
+    if not isinstance(values, list):
+        raise ValidationException(
+            f'Invalid value for key "{key}". Expected a list.'
+        )
+    for value in values:
+        if isinstance(value, dict):
+            for value_key in value:
+                if not isinstance(value_key, str):
+                    raise ValidationException(
+                        f'Expected all keys to "{key}" dict to be strings, '
+                        f'but "{value_key}" is a "{type(value_key)}"'
+                    )
+            result.append(value)
+        elif isinstance(value, str):
+            result.append(value)
+        else:
+            raise ValidationException(
+                f'Invalid value type {type(value)} in key "{key}", expected '
+                f'dict or str (value: {value}).'
+            )
+
+    return result
+
+
+def _parse_exclusions(definition) -> Optional[SelectionSpec]:
+    exclusions = _get_list_dicts(definition, 'exclude')
+    parsed_exclusions = [
+        parse_from_definition(excl) for excl in exclusions
+    ]
+    if len(parsed_exclusions) == 1:
+        return parsed_exclusions[0]
+    elif len(parsed_exclusions) > 1:
+        return SelectionUnion(
+            components=parsed_exclusions,
+            raw=exclusions
+        )
+    else:
+        return None
+
+
+def _parse_include_exclude_subdefs(
+    definitions: List[RawDefinition]
+) -> Tuple[List[SelectionSpec], Optional[SelectionSpec]]:
+    include_parts: List[SelectionSpec] = []
+    diff_arg: Optional[SelectionSpec] = None
+
+    for definition in definitions:
+        if isinstance(definition, dict) and 'exclude' in definition:
+            # do not allow multiple exclude: defs at the same level
+            if diff_arg is not None:
+                yaml_sel_cfg = yaml.dump(definition)
+                raise ValidationException(
+                    f"You cannot provide multiple exclude arguments to the "
+                    f"same selector set operator:\n{yaml_sel_cfg}"
+                )
+            diff_arg = _parse_exclusions(definition)
+        else:
+            include_parts.append(parse_from_definition(definition))
+
+    return (include_parts, diff_arg)
+
+
+def parse_union_definition(definition: Dict[str, Any]) -> SelectionSpec:
+    union_def_parts = _get_list_dicts(definition, 'union')
+    include, exclude = _parse_include_exclude_subdefs(union_def_parts)
+
+    union = SelectionUnion(components=include)
+
+    if exclude is None:
+        union.raw = definition
+        return union
+    else:
+        return SelectionDifference(
+            components=[union, exclude],
+            raw=definition
+        )
+
+
+def parse_intersection_definition(
+    definition: Dict[str, Any]
+) -> SelectionSpec:
+    intersection_def_parts = _get_list_dicts(definition, 'intersection')
+    include, exclude = _parse_include_exclude_subdefs(intersection_def_parts)
+    intersection = SelectionIntersection(components=include)
+
+    if exclude is None:
+        intersection.raw = definition
+        return intersection
+    else:
+        return SelectionDifference(
+            components=[intersection, exclude],
+            raw=definition
+        )
+
+
+def parse_dict_definition(definition: Dict[str, Any]) -> SelectionSpec:
+    diff_arg: Optional[SelectionSpec] = None
+    if len(definition) == 1:
+        key = list(definition)[0]
+        value = definition[key]
+        if not isinstance(key, str):
+            raise ValidationException(
+                f'Expected definition key to be a "str", got one of type '
+                f'"{type(key)}" ({key})'
+            )
+        dct = {
+            'method': key,
+            'value': value,
+        }
+    elif 'method' in definition and 'value' in definition:
+        dct = definition
+        if 'exclude' in definition:
+            diff_arg = _parse_exclusions(definition)
+            dct = {k: v for k, v in dct.items() if k != 'exclude'}
+    else:
+        raise ValidationException(
+            f'Expected either 1 key or else "method" '
+            f'and "value" keys, but got {list(definition)}'
+        )
+
+    # if key isn't a valid method name, this will raise
+    base = SelectionCriteria.from_dict(definition, dct)
+    if diff_arg is None:
+        return base
+    else:
+        return SelectionDifference(components=[base, diff_arg])
+
+
+def parse_from_definition(
+    definition: RawDefinition, rootlevel=False
+) -> SelectionSpec:
+
+    if (isinstance(definition, dict) and
+            ('union' in definition or 'intersection' in definition) and
+            rootlevel and len(definition) > 1):
+        keys = ",".join(definition.keys())
+        raise ValidationException(
+            f"Only a single 'union' or 'intersection' key is allowed "
+            f"in a root level selector definition; found {keys}."
+        )
+    if isinstance(definition, str):
+        return SelectionCriteria.from_single_spec(definition)
+    elif 'union' in definition:
+        return parse_union_definition(definition)
+    elif 'intersection' in definition:
+        return parse_intersection_definition(definition)
+    elif isinstance(definition, dict):
+        return parse_dict_definition(definition)
+    else:
+        raise ValidationException(
+            f'Expected to find union, intersection, str or dict, instead '
+            f'found {type(definition)}: {definition}'
+        )
+
+
+def parse_from_selectors_definition(
+    source: SelectorFile
+) -> Dict[str, SelectionSpec]:
+    result: Dict[str, SelectionSpec] = {}
+    selector: SelectorDefinition
+    for selector in source.selectors:
+        result[selector.name] = parse_from_definition(selector.definition,
+                                                      rootlevel=True)
+    return result

core/dbt/graph/graph.py

@@ -0,0 +1,105 @@
+from typing import (
+    Set, Iterable, Iterator, Optional, NewType
+)
+import networkx as nx  # type: ignore
+
+from dbt.exceptions import InternalException
+
+UniqueId = NewType('UniqueId', str)
+
+
+class Graph:
+    """A wrapper around the networkx graph that understands SelectionCriteria
+    and how they interact with the graph.
+    """
+    def __init__(self, graph):
+        self.graph = graph
+
+    def nodes(self) -> Set[UniqueId]:
+        return set(self.graph.nodes())
+
+    def edges(self):
+        return self.graph.edges()
+
+    def __iter__(self) -> Iterator[UniqueId]:
+        return iter(self.graph.nodes())
+
+    def ancestors(
+        self, node: UniqueId, max_depth: Optional[int] = None
+    ) -> Set[UniqueId]:
+        """Returns all nodes having a path to `node` in `graph`"""
+        if not self.graph.has_node(node):
+            raise InternalException(f'Node {node} not found in the graph!')
+        with nx.utils.reversed(self.graph):
+            anc = nx.single_source_shortest_path_length(G=self.graph,
+                                                        source=node,
+                                                        cutoff=max_depth)\
+                .keys()
+        return anc - {node}
+
+    def descendants(
+        self, node: UniqueId, max_depth: Optional[int] = None
+    ) -> Set[UniqueId]:
+        """Returns all nodes reachable from `node` in `graph`"""
+        if not self.graph.has_node(node):
+            raise InternalException(f'Node {node} not found in the graph!')
+        des = nx.single_source_shortest_path_length(G=self.graph,
+                                                    source=node,
+                                                    cutoff=max_depth)\
+            .keys()
+        return des - {node}
+
+    def select_childrens_parents(
+        self, selected: Set[UniqueId]
+    ) -> Set[UniqueId]:
+        ancestors_for = self.select_children(selected) | selected
+        return self.select_parents(ancestors_for) | ancestors_for
+
+    def select_children(
+        self, selected: Set[UniqueId], max_depth: Optional[int] = None
+    ) -> Set[UniqueId]:
+        descendants: Set[UniqueId] = set()
+        for node in selected:
+            descendants.update(self.descendants(node, max_depth))
+        return descendants
+
+    def select_parents(
+        self, selected: Set[UniqueId], max_depth: Optional[int] = None
+    ) -> Set[UniqueId]:
+        ancestors: Set[UniqueId] = set()
+        for node in selected:
+            ancestors.update(self.ancestors(node, max_depth))
+        return ancestors
+
+    def select_successors(self, selected: Set[UniqueId]) -> Set[UniqueId]:
+        successors: Set[UniqueId] = set()
+        for node in selected:
+            successors.update(self.graph.successors(node))
+        return successors
+
+    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)
+
+        include_nodes = set(selected)
+
+        for node in self:
+            if node not in include_nodes:
+                new_graph.remove_node(node)
+
+        for node in include_nodes:
+            if node not in new_graph:
+                raise ValueError(
+                    "Couldn't find model '{}' -- does it exist or is "
+                    "it disabled?".format(node)
+                )
+        return Graph(new_graph)
+
+    def subgraph(self, nodes: Iterable[UniqueId]) -> 'Graph':
+        return Graph(self.graph.subgraph(nodes))
+
+    def get_dependent_nodes(self, node: UniqueId):
+        return nx.descendants(self.graph, node)

core/dbt/graph/queue.py

@@ -0,0 +1,181 @@
+import threading
+from queue import PriorityQueue
+from typing import (
+    Dict, Set, Optional
+)
+
+import networkx as nx  # type: ignore
+
+from .graph import UniqueId
+from dbt.contracts.graph.parsed import ParsedSourceDefinition, ParsedExposure
+from dbt.contracts.graph.compiled import GraphMemberNode
+from dbt.contracts.graph.manifest import Manifest
+from dbt.node_types import NodeType
+
+
+class GraphQueue:
+    """A fancy queue that is backed by the dependency graph.
+    Note: this will mutate input!
+
+    This queue is thread-safe for `mark_done` calls, though you must ensure
+    that separate threads do not call `.empty()` or `__len__()` and `.get()` at
+    the same time, as there is an unlocked race!
+    """
+    def __init__(
+        self, graph: nx.DiGraph, manifest: Manifest, selected: Set[UniqueId]
+    ):
+        self.graph = graph
+        self.manifest = manifest
+        self._selected = selected
+        # store the queue as a priority queue.
+        self.inner: PriorityQueue = PriorityQueue()
+        # things that have been popped off the queue but not finished
+        # and worker thread reservations
+        self.in_progress: Set[UniqueId] = set()
+        # things that are in the queue
+        self.queued: Set[UniqueId] = set()
+        # this lock controls most things
+        self.lock = threading.Lock()
+        # store the 'score' of each node as a number. Lower is higher priority.
+        self._scores = self._calculate_scores()
+        # populate the initial queue
+        self._find_new_additions()
+        # awaits after task end
+        self.some_task_done = threading.Condition(self.lock)
+
+    def get_selected_nodes(self) -> Set[UniqueId]:
+        return self._selected.copy()
+
+    def _include_in_cost(self, node_id: UniqueId) -> bool:
+        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))
+        if node.is_ephemeral:
+            return False
+        return True
+
+    def _calculate_scores(self) -> Dict[UniqueId, int]:
+        """Calculate the 'value' of each node in the graph based on how many
+        blocking descendants it has. We use this score for the internal
+        priority queue's ordering, so the quality of this metric is important.
+
+        The score is stored as a negative number because the internal
+        PriorityQueue picks lowest values first.
+
+        We could do this in one pass over the graph instead of len(self.graph)
+        passes but this is easy. For large graphs this may hurt performance.
+
+        This operates on the graph, so it would require a lock if called from
+        outside __init__.
+
+        :return Dict[str, int]: The score dict, mapping unique IDs to integer
+            scores. Lower scores are higher priority.
+        """
+        scores = {}
+        for node in self.graph.nodes():
+            score = -1 * len([
+                d for d in nx.descendants(self.graph, node)
+                if self._include_in_cost(d)
+            ])
+            scores[node] = score
+        return scores
+
+    def get(
+        self, block: bool = True, timeout: Optional[float] = None
+    ) -> GraphMemberNode:
+        """Get a node off the inner priority queue. By default, this blocks.
+
+        This takes the lock, but only for part of it.
+
+        :param block: If True, block until the inner queue has data
+        :param timeout: If set, block for timeout seconds waiting for data.
+        :return: The node as present in the manifest.
+
+        See `queue.PriorityQueue` for more information on `get()` behavior and
+        exceptions.
+        """
+        _, node_id = self.inner.get(block=block, timeout=timeout)
+        with self.lock:
+            self._mark_in_progress(node_id)
+        return self.manifest.expect(node_id)
+
+    def __len__(self) -> int:
+        """The length of the queue is the number of tasks left for the queue to
+        give out, regardless of where they are. Incomplete tasks are not part
+        of the length.
+
+        This takes the lock.
+        """
+        with self.lock:
+            return len(self.graph) - len(self.in_progress)
+
+    def empty(self) -> bool:
+        """The graph queue is 'empty' if it all remaining nodes in the graph
+        are in progress.
+
+        This takes the lock.
+        """
+        return len(self) == 0
+
+    def _already_known(self, node: UniqueId) -> bool:
+        """Decide if a node is already known (either handed out as a task, or
+        in the queue).
+
+        Callers must hold the lock.
+
+        :param str node: The node ID to check
+        :returns bool: If the node is in progress/queued.
+        """
+        return node in self.in_progress or node in self.queued
+
+    def _find_new_additions(self) -> None:
+        """Find any nodes in the graph that need to be added to the internal
+        queue and add them.
+
+        Callers must hold the lock.
+        """
+        for node, in_degree in self.graph.in_degree():
+            if not self._already_known(node) and in_degree == 0:
+                self.inner.put((self._scores[node], node))
+                self.queued.add(node)
+
+    def mark_done(self, node_id: UniqueId) -> None:
+        """Given a node's unique ID, mark it as done.
+
+        This method takes the lock.
+
+        :param str node_id: The node ID to mark as complete.
+        """
+        with self.lock:
+            self.in_progress.remove(node_id)
+            self.graph.remove_node(node_id)
+            self._find_new_additions()
+            self.inner.task_done()
+            self.some_task_done.notify_all()
+
+    def _mark_in_progress(self, node_id: UniqueId) -> None:
+        """Mark the node as 'in progress'.
+
+        Callers must hold the lock.
+
+        :param str node_id: The node ID to mark as in progress.
+        """
+        self.queued.remove(node_id)
+        self.in_progress.add(node_id)
+
+    def join(self) -> None:
+        """Join the queue. Blocks until all tasks are marked as done.
+
+        Make sure not to call this before the queue reports that it is empty.
+        """
+        self.inner.join()
+
+    def wait_until_something_was_done(self) -> int:
+        """Block until a task is done, then return the number of unfinished
+        tasks.
+        """
+        with self.lock:
+            self.some_task_done.wait()
+            return self.inner.unfinished_tasks

core/dbt/graph/selector.py

@@ -1,364 +1,211 @@
-import networkx as nx
+
+from typing import Set, List, Optional
+
+from .graph import Graph, UniqueId
+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.utils import is_enabled, get_materialization, coalesce
 from dbt.node_types import NodeType
-import dbt.exceptions
-
-SELECTOR_PARENTS = '+'
-SELECTOR_CHILDREN = '+'
-SELECTOR_GLOB = '*'
-SELECTOR_CHILDREN_AND_ANCESTORS = '@'
-SELECTOR_DELIMITER = ':'
+from dbt.exceptions import (
+    InternalException,
+    InvalidSelectorException,
+    warn_or_error,
+)
+from dbt.contracts.graph.compiled import GraphMemberNode
+from dbt.contracts.graph.manifest import Manifest
+from dbt.contracts.state import PreviousState
 
 
-class SelectionCriteria(object):
-    def __init__(self, node_spec):
-        self.raw = node_spec
-        self.select_children = False
-        self.select_parents = False
-        self.select_childrens_parents = False
-        self.selector_type = SELECTOR_FILTERS.FQN
-
-        if node_spec.startswith(SELECTOR_CHILDREN_AND_ANCESTORS):
-            self.select_childrens_parents = True
-            node_spec = node_spec[1:]
-
-        if node_spec.startswith(SELECTOR_PARENTS):
-            self.select_parents = True
-            node_spec = node_spec[1:]
-
-        if node_spec.endswith(SELECTOR_CHILDREN):
-            self.select_children = True
-            node_spec = node_spec[:-1]
-
-        if self.select_children and self.select_childrens_parents:
-            raise dbt.exceptions.RuntimeException(
-                'Invalid node spec {} - "@" prefix and "+" suffix are '
-                'incompatible'.format(self.raw)
-            )
-
-        if SELECTOR_DELIMITER in node_spec:
-            selector_parts = node_spec.split(SELECTOR_DELIMITER, 1)
-            self.selector_type, self.selector_value = selector_parts
-        else:
-            self.selector_value = node_spec
+def get_package_names(nodes):
+    return set([node.split(".")[1] for node in nodes])
 
 
-class SELECTOR_FILTERS(object):
-    FQN = 'fqn'
-    TAG = 'tag'
-    SOURCE = 'source'
+def alert_non_existence(raw_spec, nodes):
+    if len(nodes) == 0:
+        warn_or_error(
+            f"The selector '{str(raw_spec)}' does not match any nodes and will"
+            f" be ignored"
+        )
 
 
-def split_specs(node_specs):
-    specs = set()
-    for spec in node_specs:
-        parts = spec.split(" ")
-        specs.update(parts)
-
-    return specs
-
-
-def get_package_names(graph):
-    return set([node.split(".")[1] for node in graph.nodes()])
-
-
-def is_selected_node(real_node, node_selector):
-    for i, selector_part in enumerate(node_selector):
-
-        is_last = (i == len(node_selector) - 1)
-
-        # if we hit a GLOB, then this node is selected
-        if selector_part == SELECTOR_GLOB:
-            return True
-
-        # match package.node_name or package.dir.node_name
-        elif is_last and selector_part == real_node[-1]:
-            return True
-
-        elif len(real_node) <= i:
-            return False
-
-        elif real_node[i] == selector_part:
-            continue
-
-        else:
-            return False
-
-    # if we get all the way down here, then the node is a match
-    return True
-
-
-def _node_is_match(qualified_name, package_names, fqn):
-    """Determine if a qualfied name matches an fqn, given the set of package
-    names in the graph.
-
-    :param List[str] qualified_name: The components of the selector or node
-        name, split on '.'.
-    :param Set[str] package_names: The set of pacakge names in the graph.
-    :param List[str] fqn: The node's fully qualified name in the graph.
+class NodeSelector(MethodManager):
+    """The node selector is aware of the graph and manifest,
     """
-    if len(qualified_name) == 1 and fqn[-1] == qualified_name[0]:
-        return True
+    def __init__(
+        self,
+        graph: Graph,
+        manifest: Manifest,
+        previous_state: Optional[PreviousState] = None,
+    ):
+        super().__init__(manifest, previous_state)
+        self.full_graph = graph
 
-    if qualified_name[0] in package_names:
-        if is_selected_node(fqn, qualified_name):
-            return True
+        # build a subgraph containing only non-empty, enabled nodes and enabled
+        # sources.
+        graph_members = {
+            unique_id for unique_id in self.full_graph.nodes()
+            if self._is_graph_member(unique_id)
+        }
+        self.graph = self.full_graph.subgraph(graph_members)
 
-    for package_name in package_names:
-        local_qualified_node_name = [package_name] + qualified_name
-        if is_selected_node(fqn, local_qualified_node_name):
-            return True
-
-    return False
-
-
-def warn_if_useless_spec(spec, nodes):
-    if len(nodes) > 0:
-        return
-
-    msg = (
-        "* Spec='{}' does not identify any models"
-        .format(spec['raw'])
-    )
-    dbt.exceptions.warn_or_error(msg, log_fmt='{} and was ignored\n')
-
-
-class NodeSelector(object):
-    def __init__(self, linker, manifest):
-        self.linker = linker
-        self.manifest = manifest
-
-    def _node_iterator(self, graph, exclude, include):
-        for node in graph.nodes():
-            real_node = self.manifest.nodes[node]
-            if include is not None and real_node.resource_type not in include:
-                continue
-            if exclude is not None and real_node.resource_type in exclude:
-                continue
-            yield node, real_node
-
-    def parsed_nodes(self, graph):
-        return self._node_iterator(
-            graph,
-            exclude=(NodeType.Source,),
-            include=None)
-
-    def source_nodes(self, graph):
-        return self._node_iterator(
-            graph,
-            exclude=None,
-            include=(NodeType.Source,))
-
-    def get_nodes_by_qualified_name(self, graph, qualified_name_selector):
-        """Yield all nodes in the graph that match the qualified_name_selector.
-
-        :param str qualified_name_selector: The selector or node name
+    def select_included(
+        self, included_nodes: Set[UniqueId], spec: SelectionCriteria,
+    ) -> Set[UniqueId]:
+        """Select the explicitly included nodes, using the given spec. Return
+        the selected set of unique IDs.
         """
-        qualified_name = qualified_name_selector.split(".")
-        package_names = get_package_names(graph)
-        for node, real_node in self.parsed_nodes(graph):
-            if _node_is_match(qualified_name, package_names, real_node.fqn):
-                yield node
+        method = self.get_method(spec.method, spec.method_arguments)
+        return set(method.search(included_nodes, spec.value))
 
-    def get_nodes_by_tag(self, graph, tag_name):
-        """ yields nodes from graph that have the specified tag """
-        for node, real_node in self.parsed_nodes(graph):
-            if tag_name in real_node.tags:
-                yield node
+    def get_nodes_from_criteria(
+        self,
+        spec: SelectionCriteria,
+    ) -> Set[UniqueId]:
+        """Get all nodes specified by the single selection criteria.
 
-    def get_nodes_by_source(self, graph, source_full_name):
-        """yields nodes from graph are the specified source."""
-        parts = source_full_name.split('.')
-        target_package = SELECTOR_GLOB
-        if len(parts) == 1:
-            target_source, target_table = parts[0], None
-        elif len(parts) == 2:
-            target_source, target_table = parts
-        elif len(parts) == 3:
-            target_package, target_source, target_table = parts
-        else:  # len(parts) > 3 or len(parts) == 0
-            msg = (
-                'Invalid source selector value "{}". Sources must be of the '
-                'form `${{source_name}}`, '
-                '`${{source_name}}.${{target_name}}`, or '
-                '`${{package_name}}.${{source_name}}.${{target_name}}'
-            ).format(source_full_name)
-            raise dbt.exceptions.RuntimeException(msg)
+        - collect the directly included nodes
+        - find their specified relatives
+        - perform any selector-specific expansion
+        """
 
-        for node, real_node in self.source_nodes(graph):
-            if target_package not in (real_node.package_name, SELECTOR_GLOB):
-                continue
-            if target_source not in (real_node.source_name, SELECTOR_GLOB):
-                continue
-            if target_table in (None, real_node.name, SELECTOR_GLOB):
-                yield node
+        nodes = self.graph.nodes()
+        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}]"
+            )
+            return set()
 
-    def select_childrens_parents(self, graph, selected):
-        ancestors_for = self.select_children(graph, selected) | selected
-        return self.select_parents(graph, ancestors_for) | ancestors_for
+        extras = self.collect_specified_neighbors(spec, collected)
+        result = self.expand_selection(collected | extras)
+        return result
 
-    def select_children(self, graph, selected):
-        descendants = set()
-        for node in selected:
-            descendants.update(nx.descendants(graph, node))
-        return descendants
+    def collect_specified_neighbors(
+        self, spec: SelectionCriteria, selected: Set[UniqueId]
+    ) -> Set[UniqueId]:
+        """Given the set of models selected by the explicit part of the
+        selector (like "tag:foo"), apply the modifiers on the spec ("+"/"@").
+        Return the set of additional nodes that should be collected (which may
+        overlap with the selected set).
+        """
+        additional: Set[UniqueId] = set()
+        if spec.childrens_parents:
+            additional.update(self.graph.select_childrens_parents(selected))
 
-    def select_parents(self, graph, selected):
-        ancestors = set()
-        for node in selected:
-            ancestors.update(nx.ancestors(graph, node))
-        return ancestors
+        if spec.parents:
+            depth = spec.parents_depth
+            additional.update(self.graph.select_parents(selected, depth))
 
-    def collect_models(self, graph, selected, spec):
-        additional = set()
-        if spec.select_childrens_parents:
-            additional.update(self.select_childrens_parents(graph, selected))
-        if spec.select_parents:
-            additional.update(self.select_parents(graph, selected))
-        if spec.select_children:
-            additional.update(self.select_children(graph, selected))
+        if spec.children:
+            depth = spec.children_depth
+            additional.update(self.graph.select_children(selected, depth))
         return additional
 
-    def collect_tests(self, graph, model_nodes):
-        test_nodes = set()
-        for node in model_nodes:
-            # include tests that depend on this node. if we aren't running
-            # tests, they'll be filtered out later.
-            child_tests = [n for n in graph.successors(node)
-                           if self.manifest.nodes[n].resource_type ==
-                           NodeType.Test]
-            test_nodes.update(child_tests)
-        return test_nodes
+    def select_nodes(self, spec: SelectionSpec) -> Set[UniqueId]:
+        """Select the nodes in the graph according to the spec.
 
-    def get_nodes_from_spec(self, graph, spec):
-        filter_map = {
-            SELECTOR_FILTERS.FQN: self.get_nodes_by_qualified_name,
-            SELECTOR_FILTERS.TAG: self.get_nodes_by_tag,
-            SELECTOR_FILTERS.SOURCE: self.get_nodes_by_source,
-        }
+        If the spec is a composite spec (a union, difference, or intersection),
+        recurse into its selections and combine them. If the spec is a concrete
+        selection criteria, resolve that using the given graph.
+        """
+        if isinstance(spec, SelectionCriteria):
+            result = self.get_nodes_from_criteria(spec)
+        else:
+            node_selections = [
+                self.select_nodes(component)
+                for component in spec
+            ]
+            result = spec.combined(node_selections)
+            if spec.expect_exists:
+                alert_non_existence(spec.raw, result)
+        return result
 
-        filter_method = filter_map.get(spec.selector_type)
-
-        if filter_method is None:
-            valid_selectors = ", ".join(filter_map.keys())
-            logger.info("The '{}' selector specified in {} is invalid. Must "
-                        "be one of [{}]".format(
-                            spec.selector_type,
-                            spec.raw,
-                            valid_selectors))
-
-            return set()
-
-        collected = set(filter_method(graph, spec.selector_value))
-        collected.update(self.collect_models(graph, collected, spec))
-        collected.update(self.collect_tests(graph, collected))
-
-        return collected
-
-    def select_nodes(self, graph, raw_include_specs, raw_exclude_specs):
-        selected_nodes = set()
-
-        for raw_spec in split_specs(raw_include_specs):
-            spec = SelectionCriteria(raw_spec)
-            included_nodes = self.get_nodes_from_spec(graph, spec)
-            selected_nodes.update(included_nodes)
-
-        for raw_spec in split_specs(raw_exclude_specs):
-            spec = SelectionCriteria(raw_spec)
-            excluded_nodes = self.get_nodes_from_spec(graph, spec)
-            selected_nodes.difference_update(excluded_nodes)
-
-        return selected_nodes
-
-    def _is_graph_member(self, node_name):
-        node = self.manifest.nodes[node_name]
-        if node.resource_type == NodeType.Source:
+    def _is_graph_member(self, unique_id: UniqueId) -> bool:
+        if unique_id in self.manifest.sources:
+            source = self.manifest.sources[unique_id]
+            return source.config.enabled
+        elif unique_id in self.manifest.exposures:
             return True
-        return not node.get('empty') and is_enabled(node)
+        node = self.manifest.nodes[unique_id]
+        return not node.empty and node.config.enabled
 
-    def get_valid_nodes(self, graph):
-        return [
-            node_name for node_name in graph.nodes()
-            if self._is_graph_member(node_name)
-        ]
-
-    def _is_match(self, node_name, resource_types, tags, required):
-        node = self.manifest.nodes[node_name]
-        if node.resource_type not in resource_types:
-            return False
-        tags = set(tags)
-        if tags and not bool(set(node.tags) & tags):
-            # there are tags specified but none match
-            return False
-        for attr in required:
-            if not getattr(node, attr):
-                return False
+    def node_is_match(self, node: GraphMemberNode) -> bool:
+        """Determine if a node is a match for the selector. Non-match nodes
+        will be excluded from results during filtering.
+        """
         return True
 
-    def get_selected(self, include, exclude, resource_types, tags, required):
-        graph = self.linker.graph
+    def _is_match(self, unique_id: UniqueId) -> bool:
+        node: GraphMemberNode
+        if unique_id in self.manifest.nodes:
+            node = self.manifest.nodes[unique_id]
+        elif unique_id in self.manifest.sources:
+            node = self.manifest.sources[unique_id]
+        elif unique_id in self.manifest.exposures:
+            node = self.manifest.exposures[unique_id]
+        else:
+            raise InternalException(
+                f'Node {unique_id} not found in the manifest!'
+            )
+        return self.node_is_match(node)
 
-        include = coalesce(include, ['fqn:*', 'source:*'])
-        exclude = coalesce(exclude, [])
-        tags = coalesce(tags, [])
+    def filter_selection(self, selected: Set[UniqueId]) -> Set[UniqueId]:
+        """Return the subset of selected nodes that is a match for this
+        selector.
+        """
+        return {
+            unique_id for unique_id in selected if self._is_match(unique_id)
+        }
 
-        to_run = self.get_valid_nodes(graph)
-        filtered_graph = graph.subgraph(to_run)
-        selected_nodes = self.select_nodes(filtered_graph, include, exclude)
+    def expand_selection(self, selected: Set[UniqueId]) -> Set[UniqueId]:
+        """Perform selector-specific expansion."""
+        return selected
 
-        filtered_nodes = set()
-        for node_name in selected_nodes:
-            if self._is_match(node_name, resource_types, tags, required):
-                filtered_nodes.add(node_name)
+    def get_selected(self, spec: SelectionSpec) -> Set[UniqueId]:
+        """get_selected runs trhough the node selection process:
 
+            - 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
+            - filtering:
+                - selectors can filter the nodes after all of them have been
+                  selected
+        """
+        selected_nodes = self.select_nodes(spec)
+        filtered_nodes = self.filter_selection(selected_nodes)
         return filtered_nodes
 
-    def is_ephemeral_model(self, node):
-        is_model = node.get('resource_type') == NodeType.Model
-        is_ephemeral = get_materialization(node) == 'ephemeral'
-        return is_model and is_ephemeral
+    def get_graph_queue(self, spec: SelectionSpec) -> GraphQueue:
+        """Returns a queue over nodes in the graph that tracks progress of
+        dependecies.
+        """
+        selected_nodes = self.get_selected(spec)
+        new_graph = self.full_graph.get_subset_graph(selected_nodes)
+        # should we give a way here for consumers to mutate the graph?
+        return GraphQueue(new_graph.graph, self.manifest, selected_nodes)
 
-    def get_ancestor_ephemeral_nodes(self, selected_nodes):
-        node_names = {}
-        for node_id in selected_nodes:
-            if node_id not in self.manifest.nodes:
-                continue
-            node = self.manifest.nodes[node_id]
-            # sources don't have ancestors and this results in a silly select()
-            if node.resource_type == NodeType.Source:
-                continue
-            node_names[node_id] = node.name
 
-        include_spec = [
-            '+{}'.format(node_names[node])
-            for node in selected_nodes if node in node_names
-        ]
-        if not include_spec:
-            return set()
+class ResourceTypeSelector(NodeSelector):
+    def __init__(
+        self,
+        graph: Graph,
+        manifest: Manifest,
+        previous_state: Optional[PreviousState],
+        resource_types: List[NodeType],
+    ):
+        super().__init__(
+            graph=graph,
+            manifest=manifest,
+            previous_state=previous_state,
+        )
+        self.resource_types: Set[NodeType] = set(resource_types)
 
-        all_ancestors = self.select_nodes(self.linker.graph, include_spec, [])
-
-        res = []
-        for ancestor in all_ancestors:
-            ancestor_node = self.manifest.nodes.get(ancestor, None)
-
-            if ancestor_node and self.is_ephemeral_model(ancestor_node):
-                res.append(ancestor)
-
-        return set(res)
-
-    def select(self, query):
-        include = query.get('include')
-        exclude = query.get('exclude')
-        resource_types = query.get('resource_types')
-        tags = query.get('tags')
-        required = query.get('required', ())
-
-        selected = self.get_selected(include, exclude, resource_types, tags,
-                                     required)
-
-        addins = self.get_ancestor_ephemeral_nodes(selected)
-
-        return selected | addins
+    def node_is_match(self, node):
+        return node.resource_type in self.resource_types

core/dbt/graph/selector_methods.py

@@ -0,0 +1,523 @@
+import abc
+from itertools import chain
+from pathlib import Path
+from typing import Set, List, Dict, Iterator, Tuple, Any, Union, Type, Optional
+
+from hologram.helpers import StrEnum
+
+from .graph import UniqueId
+
+from dbt.contracts.graph.compiled import (
+    CompiledDataTestNode,
+    CompiledSchemaTestNode,
+    CompileResultNode,
+    ManifestNode,
+)
+from dbt.contracts.graph.manifest import Manifest, WritableManifest
+from dbt.contracts.graph.parsed import (
+    HasTestMetadata,
+    ParsedDataTestNode,
+    ParsedExposure,
+    ParsedSchemaTestNode,
+    ParsedSourceDefinition,
+)
+from dbt.contracts.state import PreviousState
+from dbt.logger import GLOBAL_LOGGER as logger
+from dbt.exceptions import (
+    InternalException,
+    RuntimeException,
+)
+from dbt.node_types import NodeType
+from dbt.ui import warning_tag
+
+
+SELECTOR_GLOB = '*'
+SELECTOR_DELIMITER = ':'
+
+
+class MethodName(StrEnum):
+    FQN = 'fqn'
+    Tag = 'tag'
+    Source = 'source'
+    Path = 'path'
+    Package = 'package'
+    Config = 'config'
+    TestName = 'test_name'
+    TestType = 'test_type'
+    ResourceType = 'resource_type'
+    State = 'state'
+    Exposure = 'exposure'
+
+
+def is_selected_node(real_node, node_selector):
+    for i, selector_part in enumerate(node_selector):
+
+        is_last = (i == len(node_selector) - 1)
+
+        # if we hit a GLOB, then this node is selected
+        if selector_part == SELECTOR_GLOB:
+            return True
+
+        # match package.node_name or package.dir.node_name
+        elif is_last and selector_part == real_node[-1]:
+            return True
+
+        elif len(real_node) <= i:
+            return False
+
+        elif real_node[i] == selector_part:
+            continue
+
+        else:
+            return False
+
+    # if we get all the way down here, then the node is a match
+    return True
+
+
+SelectorTarget = Union[ParsedSourceDefinition, ManifestNode, ParsedExposure]
+
+
+class SelectorMethod(metaclass=abc.ABCMeta):
+    def __init__(
+        self,
+        manifest: Manifest,
+        previous_state: Optional[PreviousState],
+        arguments: List[str]
+    ):
+        self.manifest: Manifest = manifest
+        self.previous_state = previous_state
+        self.arguments: List[str] = arguments
+
+    def parsed_nodes(
+        self,
+        included_nodes: Set[UniqueId]
+    ) -> Iterator[Tuple[UniqueId, ManifestNode]]:
+
+        for key, node in self.manifest.nodes.items():
+            unique_id = UniqueId(key)
+            if unique_id not in included_nodes:
+                continue
+            yield unique_id, node
+
+    def source_nodes(
+        self,
+        included_nodes: Set[UniqueId]
+    ) -> Iterator[Tuple[UniqueId, ParsedSourceDefinition]]:
+
+        for key, source in self.manifest.sources.items():
+            unique_id = UniqueId(key)
+            if unique_id not in included_nodes:
+                continue
+            yield unique_id, source
+
+    def exposure_nodes(
+        self,
+        included_nodes: Set[UniqueId]
+    ) -> Iterator[Tuple[UniqueId, ParsedExposure]]:
+
+        for key, exposure in self.manifest.exposures.items():
+            unique_id = UniqueId(key)
+            if unique_id not in included_nodes:
+                continue
+            yield unique_id, exposure
+
+    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))
+
+    def configurable_nodes(
+        self,
+        included_nodes: Set[UniqueId]
+    ) -> Iterator[Tuple[UniqueId, CompileResultNode]]:
+        yield from chain(self.parsed_nodes(included_nodes),
+                         self.source_nodes(included_nodes))
+
+    def non_source_nodes(
+        self,
+        included_nodes: Set[UniqueId],
+    ) -> Iterator[Tuple[UniqueId, Union[ParsedExposure, ManifestNode]]]:
+        yield from chain(self.parsed_nodes(included_nodes),
+                         self.exposure_nodes(included_nodes))
+
+    @abc.abstractmethod
+    def search(
+        self,
+        included_nodes: Set[UniqueId],
+        selector: str,
+    ) -> Iterator[UniqueId]:
+        raise NotImplementedError('subclasses should implement this')
+
+
+class QualifiedNameSelectorMethod(SelectorMethod):
+    def node_is_match(
+        self,
+        qualified_name: List[str],
+        package_names: Set[str],
+        fqn: List[str],
+    ) -> bool:
+        """Determine if a qualfied name matches an fqn, given the set of package
+        names in the graph.
+
+        :param List[str] qualified_name: The components of the selector or node
+            name, split on '.'.
+        :param Set[str] package_names: The set of pacakge names in the graph.
+        :param List[str] fqn: The node's fully qualified name in the graph.
+        """
+        if len(qualified_name) == 1 and fqn[-1] == qualified_name[0]:
+            return True
+
+        if qualified_name[0] in package_names:
+            if is_selected_node(fqn, qualified_name):
+                return True
+
+        for package_name in package_names:
+            local_qualified_node_name = [package_name] + qualified_name
+            if is_selected_node(fqn, local_qualified_node_name):
+                return True
+
+        return False
+
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        """Yield all nodes in the graph that match the selector.
+
+        :param str selector: The selector or node name
+        """
+        qualified_name = selector.split(".")
+        parsed_nodes = list(self.parsed_nodes(included_nodes))
+        package_names = {n.package_name for _, n in parsed_nodes}
+        for node, real_node in parsed_nodes:
+            if self.node_is_match(
+                qualified_name,
+                package_names,
+                real_node.fqn,
+            ):
+                yield node
+
+
+class TagSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        """ yields nodes from included that have the specified tag """
+        for node, real_node in self.all_nodes(included_nodes):
+            if selector in real_node.tags:
+                yield node
+
+
+class SourceSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        """yields nodes from included are the specified source."""
+        parts = selector.split('.')
+        target_package = SELECTOR_GLOB
+        if len(parts) == 1:
+            target_source, target_table = parts[0], None
+        elif len(parts) == 2:
+            target_source, target_table = parts
+        elif len(parts) == 3:
+            target_package, target_source, target_table = parts
+        else:  # len(parts) > 3 or len(parts) == 0
+            msg = (
+                'Invalid source selector value "{}". Sources must be of the '
+                'form `${{source_name}}`, '
+                '`${{source_name}}.${{target_name}}`, or '
+                '`${{package_name}}.${{source_name}}.${{target_name}}'
+            ).format(selector)
+            raise RuntimeException(msg)
+
+        for node, real_node in self.source_nodes(included_nodes):
+            if target_package not in (real_node.package_name, SELECTOR_GLOB):
+                continue
+            if target_source not in (real_node.source_name, SELECTOR_GLOB):
+                continue
+            if target_table not in (None, real_node.name, SELECTOR_GLOB):
+                continue
+
+            yield node
+
+
+class ExposureSelectorMethod(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 exposure selector value "{}". Exposures must be of '
+                'the form ${{exposure_name}} or '
+                '${{exposure_package.exposure_name}}'
+            ).format(selector)
+            raise RuntimeException(msg)
+
+        for node, real_node in self.exposure_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
+    ) -> Iterator[UniqueId]:
+        """Yields nodes from inclucded that match the given path.
+
+        """
+        # use '.' and not 'root' for easy comparison
+        root = Path.cwd()
+        paths = set(p.relative_to(root) for p in root.glob(selector))
+        for node, real_node in self.all_nodes(included_nodes):
+            if Path(real_node.root_path) != root:
+                continue
+            ofp = Path(real_node.original_file_path)
+            if ofp in paths:
+                yield node
+            elif any(parent in paths for parent in ofp.parents):
+                yield node
+
+
+class PackageSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        """Yields nodes from included that have the specified package"""
+        for node, real_node in self.all_nodes(included_nodes):
+            if real_node.package_name == selector:
+                yield node
+
+
+def _getattr_descend(obj: Any, attrs: List[str]) -> Any:
+    value = obj
+    for attr in attrs:
+        try:
+            value = getattr(value, attr)
+        except AttributeError:
+            # if it implements getitem (dict, list, ...), use that. On failure,
+            # raise an attribute error instead of the KeyError, TypeError, etc.
+            # that arbitrary getitem calls might raise
+            try:
+                value = value[attr]
+            except Exception as exc:
+                raise AttributeError(
+                    f"'{type(value)}' object has no attribute '{attr}'"
+                ) from exc
+    return value
+
+
+class CaseInsensitive(str):
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.upper() == other.upper()
+        else:
+            return self.upper() == other
+
+
+class ConfigSelectorMethod(SelectorMethod):
+    def search(
+        self,
+        included_nodes: Set[UniqueId],
+        selector: Any,
+    ) -> Iterator[UniqueId]:
+        parts = self.arguments
+        # special case: if the user wanted to compare test severity,
+        # make the comparison case-insensitive
+        if parts == ['severity']:
+            selector = CaseInsensitive(selector)
+
+        # search sources is kind of useless now source configs only have
+        # 'enabled', which you can't really filter on anyway, but maybe we'll
+        # add more someday, so search them anyway.
+        for node, real_node in self.configurable_nodes(included_nodes):
+            try:
+                value = _getattr_descend(real_node.config, parts)
+            except AttributeError:
+                continue
+            else:
+                if selector == value:
+                    yield node
+
+
+class ResourceTypeSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        try:
+            resource_type = NodeType(selector)
+        except ValueError as exc:
+            raise RuntimeException(
+                f'Invalid resource_type selector "{selector}"'
+            ) from exc
+        for node, real_node in self.parsed_nodes(included_nodes):
+            if real_node.resource_type == resource_type:
+                yield node
+
+
+class TestNameSelectorMethod(SelectorMethod):
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        for node, real_node in self.parsed_nodes(included_nodes):
+            if isinstance(real_node, HasTestMetadata):
+                if real_node.test_metadata.name == selector:
+                    yield node
+
+
+class TestTypeSelectorMethod(SelectorMethod):
+    def search(
+        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)
+        else:
+            raise RuntimeException(
+                f'Invalid test type selector {selector}: expected "data" or '
+                '"schema"'
+            )
+
+        for node, real_node in self.parsed_nodes(included_nodes):
+            if isinstance(real_node, search_types):
+                yield node
+
+
+class StateSelectorMethod(SelectorMethod):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.macros_were_modified: Optional[List[str]] = None
+
+    def _macros_modified(self) -> List[str]:
+        # we checked in the caller!
+        if self.previous_state is None or self.previous_state.manifest is None:
+            raise InternalException(
+                'No comparison manifest in _macros_modified'
+            )
+        old_macros = self.previous_state.manifest.macros
+        new_macros = self.manifest.macros
+
+        modified = []
+        for uid, macro in new_macros.items():
+            name = f'{macro.package_name}.{macro.name}'
+            if uid in old_macros:
+                old_macro = old_macros[uid]
+                if macro.macro_sql != old_macro.macro_sql:
+                    modified.append(f'{name} changed')
+            else:
+                modified.append(f'{name} added')
+
+        for uid, macro in old_macros.items():
+            if uid not in new_macros:
+                modified.append(f'{macro.package_name}.{macro.name} removed')
+
+        return modified[:3]
+
+    def check_modified(
+        self,
+        old: Optional[SelectorTarget],
+        new: SelectorTarget,
+    ) -> bool:
+        # check if there are any changes in macros, if so, log a warning the
+        # first time
+        if self.macros_were_modified is None:
+            self.macros_were_modified = self._macros_modified()
+            if self.macros_were_modified:
+                log_str = ', '.join(self.macros_were_modified)
+                logger.warning(warning_tag(
+                    f'During a state comparison, dbt detected a change in '
+                    f'macros. This will not be marked as a modification. Some '
+                    f'macros: {log_str}'
+                ))
+
+        return not new.same_contents(old)  # type: ignore
+
+    def check_new(
+        self,
+        old: Optional[SelectorTarget],
+        new: SelectorTarget,
+    ) -> bool:
+        return old is None
+
+    def search(
+        self, included_nodes: Set[UniqueId], selector: str
+    ) -> Iterator[UniqueId]:
+        if self.previous_state is None or self.previous_state.manifest is None:
+            raise RuntimeException(
+                'Got a state selector method, but no comparison manifest'
+            )
+
+        state_checks = {
+            'modified': self.check_modified,
+            'new': self.check_new,
+        }
+        if selector in state_checks:
+            checker = state_checks[selector]
+        else:
+            raise RuntimeException(
+                f'Got an invalid selector "{selector}", expected one of '
+                f'"{list(state_checks)}"'
+            )
+
+        manifest: WritableManifest = self.previous_state.manifest
+
+        for node, real_node in self.all_nodes(included_nodes):
+            previous_node: Optional[SelectorTarget] = None
+            if node in manifest.nodes:
+                previous_node = manifest.nodes[node]
+            elif node in manifest.sources:
+                previous_node = manifest.sources[node]
+            elif node in manifest.exposures:
+                previous_node = manifest.exposures[node]
+
+            if checker(previous_node, real_node):
+                yield node
+
+
+class MethodManager:
+    SELECTOR_METHODS: Dict[MethodName, Type[SelectorMethod]] = {
+        MethodName.FQN: QualifiedNameSelectorMethod,
+        MethodName.Tag: TagSelectorMethod,
+        MethodName.Source: SourceSelectorMethod,
+        MethodName.Path: PathSelectorMethod,
+        MethodName.Package: PackageSelectorMethod,
+        MethodName.Config: ConfigSelectorMethod,
+        MethodName.TestName: TestNameSelectorMethod,
+        MethodName.TestType: TestTypeSelectorMethod,
+        MethodName.State: StateSelectorMethod,
+        MethodName.Exposure: ExposureSelectorMethod,
+    }
+
+    def __init__(
+        self,
+        manifest: Manifest,
+        previous_state: Optional[PreviousState],
+    ):
+        self.manifest = manifest
+        self.previous_state = previous_state
+
+    def get_method(
+        self, method: MethodName, method_arguments: List[str]
+    ) -> SelectorMethod:
+
+        if method not in self.SELECTOR_METHODS:
+            raise InternalException(
+                f'Method name "{method}" is a valid node selection '
+                f'method name, but it is not handled'
+            )
+        cls: Type[SelectorMethod] = self.SELECTOR_METHODS[method]
+        return cls(self.manifest, self.previous_state, method_arguments)

core/dbt/graph/selector_spec.py

@@ -0,0 +1,208 @@
+import os
+import re
+from abc import ABCMeta, abstractmethod
+from dataclasses import dataclass
+
+from typing import (
+    Set, Iterator, List, Optional, Dict, Union, Any, Iterable, Tuple
+)
+from .graph import UniqueId
+from .selector_methods import MethodName
+from dbt.exceptions import RuntimeException, InvalidSelectorException
+
+
+RAW_SELECTOR_PATTERN = re.compile(
+    r'\A'
+    r'(?P<childrens_parents>(\@))?'
+    r'(?P<parents>((?P<parents_depth>(\d*))\+))?'
+    r'((?P<method>([\w.]+)):)?(?P<value>(.*?))'
+    r'(?P<children>(\+(?P<children_depth>(\d*))))?'
+    r'\Z'
+)
+SELECTOR_METHOD_SEPARATOR = '.'
+
+
+def _probably_path(value: str):
+    """Decide if value is probably a path. Windows has two path separators, so
+    we should check both sep ('\\') and altsep ('/') there.
+    """
+    if os.path.sep in value:
+        return True
+    elif os.path.altsep is not None and os.path.altsep in value:
+        return True
+    else:
+        return False
+
+
+def _match_to_int(match: Dict[str, str], key: str) -> Optional[int]:
+    raw = match.get(key)
+    # turn the empty string into None, too.
+    if not raw:
+        return None
+    try:
+        return int(raw)
+    except ValueError as exc:
+        raise RuntimeException(
+            f'Invalid node spec - could not handle parent depth {raw}'
+        ) from exc
+
+
+SelectionSpec = Union[
+    'SelectionCriteria',
+    'SelectionIntersection',
+    'SelectionDifference',
+    'SelectionUnion',
+]
+
+
+@dataclass
+class SelectionCriteria:
+    raw: Any
+    method: MethodName
+    method_arguments: List[str]
+    value: Any
+    childrens_parents: bool
+    parents: bool
+    parents_depth: Optional[int]
+    children: bool
+    children_depth: Optional[int]
+
+    def __post_init__(self):
+        if self.children and self.childrens_parents:
+            raise RuntimeException(
+                f'Invalid node spec {self.raw} - "@" prefix and "+" suffix '
+                'are incompatible'
+            )
+
+    @classmethod
+    def default_method(cls, value: str) -> MethodName:
+        if _probably_path(value):
+            return MethodName.Path
+        else:
+            return MethodName.FQN
+
+    @classmethod
+    def parse_method(
+        cls, groupdict: Dict[str, Any]
+    ) -> Tuple[MethodName, List[str]]:
+        raw_method = groupdict.get('method')
+        if raw_method is None:
+            return cls.default_method(groupdict['value']), []
+
+        method_parts: List[str] = raw_method.split(SELECTOR_METHOD_SEPARATOR)
+        try:
+            method_name = MethodName(method_parts[0])
+        except ValueError as exc:
+            raise InvalidSelectorException(
+                f"'{method_parts[0]}' is not a valid method name"
+            ) from exc
+
+        method_arguments: List[str] = method_parts[1:]
+
+        return method_name, method_arguments
+
+    @classmethod
+    def from_dict(cls, raw: Any, dct: Dict[str, Any]) -> 'SelectionCriteria':
+        if 'value' not in dct:
+            raise RuntimeException(
+                f'Invalid node spec "{raw}" - no search value!'
+            )
+        method_name, method_arguments = cls.parse_method(dct)
+
+        parents_depth = _match_to_int(dct, 'parents_depth')
+        children_depth = _match_to_int(dct, 'children_depth')
+        return cls(
+            raw=raw,
+            method=method_name,
+            method_arguments=method_arguments,
+            value=dct['value'],
+            childrens_parents=bool(dct.get('childrens_parents')),
+            parents=bool(dct.get('parents')),
+            parents_depth=parents_depth,
+            children=bool(dct.get('children')),
+            children_depth=children_depth,
+        )
+
+    @classmethod
+    def dict_from_single_spec(cls, raw: str):
+        result = RAW_SELECTOR_PATTERN.match(raw)
+        if result is None:
+            return {'error': 'Invalid selector spec'}
+        dct: Dict[str, Any] = result.groupdict()
+        method_name, method_arguments = cls.parse_method(dct)
+        meth_name = str(method_name)
+        if method_arguments:
+            meth_name = meth_name + '.' + '.'.join(method_arguments)
+        dct['method'] = meth_name
+        dct = {k: v for k, v in dct.items() if (v is not None and v != '')}
+        if 'childrens_parents' in dct:
+            dct['childrens_parents'] = bool(dct.get('childrens_parents'))
+        if 'parents' in dct:
+            dct['parents'] = bool(dct.get('parents'))
+        if 'children' in dct:
+            dct['children'] = bool(dct.get('children'))
+        return dct
+
+    @classmethod
+    def from_single_spec(cls, raw: str) -> 'SelectionCriteria':
+        result = RAW_SELECTOR_PATTERN.match(raw)
+        if result is None:
+            # bad spec!
+            raise RuntimeException(f'Invalid selector spec "{raw}"')
+
+        return cls.from_dict(raw, result.groupdict())
+
+
+class BaseSelectionGroup(Iterable[SelectionSpec], metaclass=ABCMeta):
+    def __init__(
+        self,
+        components: Iterable[SelectionSpec],
+        expect_exists: bool = False,
+        raw: Any = None,
+    ):
+        self.components: List[SelectionSpec] = list(components)
+        self.expect_exists = expect_exists
+        self.raw = raw
+
+    def __iter__(self) -> Iterator[SelectionSpec]:
+        for component in self.components:
+            yield component
+
+    @abstractmethod
+    def combine_selections(
+        self,
+        selections: List[Set[UniqueId]],
+    ) -> Set[UniqueId]:
+        raise NotImplementedError(
+            '_combine_selections not implemented!'
+        )
+
+    def combined(self, selections: List[Set[UniqueId]]) -> Set[UniqueId]:
+        if not selections:
+            return set()
+
+        return self.combine_selections(selections)
+
+
+class SelectionIntersection(BaseSelectionGroup):
+    def combine_selections(
+        self,
+        selections: List[Set[UniqueId]],
+    ) -> Set[UniqueId]:
+        return set.intersection(*selections)
+
+
+class SelectionDifference(BaseSelectionGroup):
+    def combine_selections(
+        self,
+        selections: List[Set[UniqueId]],
+    ) -> Set[UniqueId]:
+        return set.difference(*selections)
+
+
+class SelectionUnion(BaseSelectionGroup):
+    def combine_selections(
+        self,
+        selections: List[Set[UniqueId]],
+    ) -> Set[UniqueId]:
+        return set.union(*selections)

core/dbt/helper_types.py

@@ -0,0 +1,82 @@
+# never name this package "types", or mypy will crash in ugly ways
+from dataclasses import dataclass
+from datetime import timedelta
+from pathlib import Path
+from typing import NewType, Tuple, AbstractSet
+
+from hologram import (
+    FieldEncoder, JsonSchemaMixin, JsonDict, ValidationError
+)
+from hologram.helpers import StrEnum
+
+Port = NewType('Port', int)
+
+
+class PortEncoder(FieldEncoder):
+    @property
+    def json_schema(self):
+        return {'type': 'integer', 'minimum': 0, 'maximum': 65535}
+
+
+class TimeDeltaFieldEncoder(FieldEncoder[timedelta]):
+    """Encodes timedeltas to dictionaries"""
+
+    def to_wire(self, value: timedelta) -> float:
+        return value.total_seconds()
+
+    def to_python(self, value) -> timedelta:
+        if isinstance(value, timedelta):
+            return value
+        try:
+            return timedelta(seconds=value)
+        except TypeError:
+            raise ValidationError(
+                'cannot encode {} into timedelta'.format(value)
+            ) from None
+
+    @property
+    def json_schema(self) -> JsonDict:
+        return {'type': 'number'}
+
+
+class PathEncoder(FieldEncoder):
+    def to_wire(self, value: Path) -> str:
+        return str(value)
+
+    def to_python(self, value) -> Path:
+        if isinstance(value, Path):
+            return value
+        try:
+            return Path(value)
+        except TypeError:
+            raise ValidationError(
+                'cannot encode {} into timedelta'.format(value)
+            ) from None
+
+    @property
+    def json_schema(self) -> JsonDict:
+        return {'type': 'string'}
+
+
+class NVEnum(StrEnum):
+    novalue = 'novalue'
+
+    def __eq__(self, other):
+        return isinstance(other, NVEnum)
+
+
+@dataclass
+class NoValue(JsonSchemaMixin):
+    """Sometimes, you want a way to say none that isn't None"""
+    novalue: NVEnum = NVEnum.novalue
+
+
+JsonSchemaMixin.register_field_encoders({
+    Port: PortEncoder(),
+    timedelta: TimeDeltaFieldEncoder(),
+    Path: PathEncoder(),
+})
+
+
+FQNPath = Tuple[str, ...]
+PathSet = AbstractSet[FQNPath]

core/dbt/hooks.py

@@ -1,41 +1,21 @@
-
+from hologram.helpers import StrEnum
 import json
-from dbt.compat import to_string
+
+from typing import Union, Dict, Any
 
 
-class ModelHookType:
+class ModelHookType(StrEnum):
     PreHook = 'pre-hook'
     PostHook = 'post-hook'
-    Both = [PreHook, PostHook]
 
 
-def _parse_hook_to_dict(hook_string):
+def get_hook_dict(source: Union[str, Dict[str, Any]]) -> Dict[str, Any]:
+    """From a source string-or-dict, get a dictionary that can be passed to
+    Hook.from_dict
+    """
+    if isinstance(source, dict):
+        return source
     try:
-        hook_dict = json.loads(hook_string)
+        return json.loads(source)
     except ValueError:
-        hook_dict = {"sql": hook_string}
-
-    if 'transaction' not in hook_dict:
-        hook_dict['transaction'] = True
-
-    return hook_dict
-
-
-def get_hook_dict(hook, index):
-    if isinstance(hook, dict):
-        hook_dict = hook
-    else:
-        hook_dict = _parse_hook_to_dict(to_string(hook))
-
-    hook_dict['index'] = index
-    return hook_dict
-
-
-def get_hooks(model, hook_key):
-    hooks = model.config.get(hook_key, [])
-
-    if not isinstance(hooks, (list, tuple)):
-        hooks = [hooks]
-
-    wrapped = [get_hook_dict(hook, i) for i, hook in enumerate(hooks)]
-    return wrapped
+        return {'sql': source}

core/dbt/include/__init__.py

@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)

core/dbt/include/global_project/__init__.py

@@ -5,7 +5,3 @@ PROJECT_NAME = 'dbt'
 
 DOCS_INDEX_FILE_PATH = os.path.normpath(
     os.path.join(PACKAGE_PATH, '..', "index.html"))
-
-
-# Adapter registration will add to this
-PACKAGES = {PROJECT_NAME: PACKAGE_PATH}

core/dbt/include/global_project/dbt_project.yml

@@ -1,4 +1,4 @@
-
+config-version: 2
 name: dbt
 version: 1.0
 

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

@@ -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://slack.getdbt.com/) on Slack for live questions and support.
+- Join the [chat](https://community.getdbt.com/) on Slack for live questions and support.
 
 {% enddocs %}

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

@@ -1,35 +1,5 @@
-{% macro adapter_macro(name) -%}
-{% set original_name = name %}
-  {% if '.' in name %}
-    {% set package_name, name = name.split(".", 1) %}
-  {% else %}
-    {% set package_name = none %}
-  {% endif %}
-
-  {% if package_name is none %}
-    {% set package_context = context %}
-  {% elif package_name in context %}
-    {% set package_context = context[package_name] %}
-  {% else %}
-    {% set error_msg %}
-        In adapter_macro: could not find package '{{package_name}}', called with '{{original_name}}'
-    {% endset %}
-    {{ exceptions.raise_compiler_error(error_msg | trim) }}
-  {% endif %}
-
-  {%- set separator = '__' -%}
-  {%- set search_name = adapter.type() + separator + name -%}
-  {%- set default_name = 'default' + separator + name -%}
-
-  {%- if package_context.get(search_name) is not none -%}
-    {{ return(package_context[search_name](*varargs, **kwargs)) }}
-  {%- else -%}
-    {{ return(package_context[default_name](*varargs, **kwargs)) }}
-  {%- endif -%}
-{%- endmacro %}
-
 {% macro get_columns_in_query(select_sql) -%}
-  {{ return(adapter_macro('get_columns_in_query', select_sql)) }}
+  {{ return(adapter.dispatch('get_columns_in_query')(select_sql)) }}
 {% endmacro %}
 
 {% macro default__get_columns_in_query(select_sql) %}
@@ -44,54 +14,62 @@
     {{ return(load_result('get_columns_in_query').table.columns | map(attribute='name') | list) }}
 {% endmacro %}
 
-{% macro create_schema(database_name, schema_name) -%}
-  {{ adapter_macro('create_schema', database_name, schema_name) }}
+{% macro create_schema(relation) -%}
+  {{ adapter.dispatch('create_schema')(relation) }}
 {% endmacro %}
 
-{% macro default__create_schema(database_name, schema_name) -%}
+{% macro default__create_schema(relation) -%}
   {%- call statement('create_schema') -%}
-    create schema if not exists {{database_name}}.{{schema_name}}
+    create schema if not exists {{ relation.without_identifier() }}
   {% endcall %}
 {% endmacro %}
 
-{% macro drop_schema(database_name, schema_name) -%}
-  {{ adapter_macro('drop_schema', database_name, schema_name) }}
+{% macro drop_schema(relation) -%}
+  {{ adapter.dispatch('drop_schema')(relation) }}
 {% endmacro %}
 
-{% macro default__drop_schema(database_name, schema_name) -%}
+{% macro default__drop_schema(relation) -%}
   {%- call statement('drop_schema') -%}
-    drop schema if exists {{database_name}}.{{schema_name}} cascade
+    drop schema if exists {{ relation.without_identifier() }} cascade
   {% endcall %}
 {% endmacro %}
 
 {% macro create_table_as(temporary, relation, sql) -%}
-  {{ adapter_macro('create_table_as', temporary, relation, sql) }}
+  {{ adapter.dispatch('create_table_as')(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 create_view_as(relation, sql) -%}
-  {{ adapter_macro('create_view_as', relation, sql) }}
+  {{ adapter.dispatch('create_view_as')(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_schemas) -%}
-  {{ return(adapter_macro('get_catalog', information_schemas)) }}
+{% macro get_catalog(information_schema, schemas) -%}
+  {{ return(adapter.dispatch('get_catalog')(information_schema, schemas)) }}
 {%- endmacro %}
 
-{% macro default__get_catalog(information_schemas) -%}
+{% macro default__get_catalog(information_schema, schemas) -%}
 
   {% set typename = adapter.type() %}
   {% set msg -%}
@@ -103,7 +81,7 @@
 
 
 {% macro get_columns_in_relation(relation) -%}
-  {{ return(adapter_macro('get_columns_in_relation', relation)) }}
+  {{ return(adapter.dispatch('get_columns_in_relation')(relation)) }}
 {% endmacro %}
 
 {% macro sql_convert_columns_in_relation(table) -%}
@@ -115,14 +93,50 @@
 {% endmacro %}
 
 {% macro default__get_columns_in_relation(relation) -%}
-  {{ dbt.exceptions.raise_not_implemented(
+  {{ 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_macro('alter_column_type', relation, column_name, new_column_type)) }}
+  {{ return(adapter.dispatch('alter_column_type')(relation, column_name, new_column_type)) }}
 {% endmacro %}
 
+
+
+{% macro alter_column_comment(relation, column_dict) -%}
+  {{ return(adapter.dispatch('alter_column_comment')(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')(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')(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)
@@ -133,17 +147,17 @@
   {%- set tmp_column = column_name + "__dbt_alter" -%}
 
   {% call statement('alter_column_type') %}
-    alter table {{ relation }} add column {{ tmp_column }} {{ new_column_type }};
-    update {{ relation }} set {{ tmp_column }} = {{ column_name }};
-    alter table {{ relation }} drop column {{ column_name }} cascade;
-    alter table {{ relation }} rename column {{ tmp_column }} to {{ column_name }}
+    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_macro('drop_relation', relation)) }}
+  {{ return(adapter.dispatch('drop_relation')(relation)) }}
 {% endmacro %}
 
 
@@ -154,7 +168,7 @@
 {% endmacro %}
 
 {% macro truncate_relation(relation) -%}
-  {{ return(adapter_macro('truncate_relation', relation)) }}
+  {{ return(adapter.dispatch('truncate_relation')(relation)) }}
 {% endmacro %}
 
 
@@ -165,7 +179,7 @@
 {% endmacro %}
 
 {% macro rename_relation(from_relation, to_relation) -%}
-  {{ return(adapter_macro('rename_relation', from_relation, to_relation)) }}
+  {{ return(adapter.dispatch('rename_relation')(from_relation, to_relation)) }}
 {% endmacro %}
 
 {% macro default__rename_relation(from_relation, to_relation) -%}
@@ -177,93 +191,100 @@
 
 
 {% macro information_schema_name(database) %}
-  {{ return(adapter_macro('information_schema_name', database)) }}
+  {{ return(adapter.dispatch('information_schema_name')(database)) }}
 {% endmacro %}
 
 {% macro default__information_schema_name(database) -%}
   {%- if database -%}
-    {{ adapter.quote_as_configured(database, 'database') }}.information_schema
+    {{ database }}.INFORMATION_SCHEMA
   {%- else -%}
-    information_schema
+    INFORMATION_SCHEMA
   {%- endif -%}
 {%- endmacro %}
 
 
 {% macro list_schemas(database) -%}
-  {{ return(adapter_macro('list_schemas', database)) }}
+  {{ return(adapter.dispatch('list_schemas')(database)) }}
 {% endmacro %}
 
 {% macro default__list_schemas(database) -%}
-  {% call statement('list_schemas', fetch_result=True, auto_begin=False) %}
+  {% set sql %}
     select distinct schema_name
-    from {{ information_schema_name(database) }}.schemata
+    from {{ information_schema_name(database) }}.SCHEMATA
     where catalog_name ilike '{{ database }}'
-  {% endcall %}
-  {{ return(load_result('list_schemas').table) }}
+  {% endset %}
+  {{ return(run_query(sql)) }}
 {% endmacro %}
 
 
 {% macro check_schema_exists(information_schema, schema) -%}
-  {{ return(adapter_macro('check_schema_exists', information_schema, schema)) }}
+  {{ return(adapter.dispatch('check_schema_exists')(information_schema, schema)) }}
 {% endmacro %}
 
 {% macro default__check_schema_exists(information_schema, schema) -%}
-  {% call statement('check_schema_exists', fetch_result=True, auto_begin=False) -%}
+  {% set sql -%}
         select count(*)
-        from {{ information_schema }}.schemata
+        from {{ information_schema.replace(information_schema_view='SCHEMATA') }}
         where catalog_name='{{ information_schema.database }}'
           and schema_name='{{ schema }}'
-  {%- endcall %}
-  {{ return(load_result('check_schema_exists').table) }}
+  {%- endset %}
+  {{ return(run_query(sql)) }}
 {% endmacro %}
 
 
-{% macro list_relations_without_caching(information_schema, schema) %}
-  {{ return(adapter_macro('list_relations_without_caching', information_schema, schema)) }}
+{% macro list_relations_without_caching(schema_relation) %}
+  {{ return(adapter.dispatch('list_relations_without_caching')(schema_relation)) }}
 {% endmacro %}
 
 
-{% macro default__list_relations_without_caching(information_schema, schema) %}
-  {{ dbt.exceptions.raise_not_implemented(
+{% 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_macro('current_timestamp') }}
+  {{ adapter.dispatch('current_timestamp')() }}
 {%- endmacro %}
 
 
 {% macro default__current_timestamp() -%}
-  {{ dbt.exceptions.raise_not_implemented(
+  {{ exceptions.raise_not_implemented(
     'current_timestamp macro not implemented for adapter '+adapter.type()) }}
 {%- endmacro %}
 
 
-{% macro collect_freshness(source, loaded_at_field) %}
-  {{ return(adapter_macro('collect_freshness', source, loaded_at_field))}}
+{% macro collect_freshness(source, loaded_at_field, filter) %}
+  {{ return(adapter.dispatch('collect_freshness')(source, loaded_at_field, filter))}}
 {% endmacro %}
 
 
-{% macro default__collect_freshness(source, loaded_at_field) %}
-  {% call statement('check_schema_exists', fetch_result=True, auto_begin=False) -%}
+{% 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('check_schema_exists').table) }}
+  {{ return(load_result('collect_freshness').table) }}
 {% endmacro %}
 
 {% macro make_temp_relation(base_relation, suffix='__dbt_tmp') %}
-  {{ return(adapter_macro('make_temp_relation', base_relation, suffix))}}
+  {{ return(adapter.dispatch('make_temp_relation')(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},
-                                table_name=tmp_identifier) -%}
+                                path={"identifier": tmp_identifier}) -%}
 
     {% do return(tmp_relation) %}
 {% endmacro %}
+
+{% macro set_sql_header(config) -%}
+  {{ config.set('sql_header', caller()) }}
+{%- endmacro %}
+

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

@@ -1,22 +1,22 @@
 {% macro statement(name=None, fetch_result=False, auto_begin=True) -%}
   {%- if execute: -%}
-    {%- set sql = render(caller()) -%}
+    {%- set sql = caller() -%}
 
     {%- if name == 'main' -%}
       {{ log('Writing runtime SQL for node "{}"'.format(model['unique_id'])) }}
       {{ write(sql) }}
     {%- endif -%}
 
-    {%- set status, res = adapter.execute(sql, auto_begin=auto_begin, fetch=fetch_result) -%}
+    {%- set res, table = adapter.execute(sql, auto_begin=auto_begin, fetch=fetch_result) -%}
     {%- if name is not none -%}
-      {{ store_result(name, status=status, agate_table=res) }}
+      {{ store_result(name, response=res, agate_table=table) }}
     {%- endif -%}
 
   {%- endif -%}
 {%- endmacro %}
 
-{% macro noop_statement(name=None, status=None, res=None) -%}
-  {%- set sql = render(caller()) -%}
+{% macro noop_statement(name=None, message=None, code=None, rows_affected=None, res=None) -%}
+  {%- set sql = caller() -%}
 
   {%- if name == 'main' -%}
     {{ log('Writing runtime SQL for node "{}"'.format(model['unique_id'])) }}
@@ -24,7 +24,7 @@
   {%- endif -%}
 
   {%- if name is not none -%}
-    {{ store_result(name, status=status, agate_table=res) }}
+    {{ store_raw_result(name, message=message, code=code, rows_affected=rows_affected, agate_table=res) }}
   {%- endif -%}
 
 {%- endmacro %}