Enable deprecation of dbt_utils.current_timestamp

.changes/unreleased/Docs-20220920-152040.yaml

@@ -1,7 +0,0 @@
-kind: Docs
-body: Refer to exposures by their label by default.
-time: 2022-09-20T15:20:40.652948-05:00
-custom:
-  Author: emmyoop
-  Issue: "306"
-  PR: "307"

.changes/unreleased/Features-20220716-142116.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: merge_exclude_columns for incremental materialization
-time: 2022-07-16T14:21:16.592519-05:00
-custom:
-  Author: dave-connors-3
-  Issue: "5260"
-  PR: "5457"

.changes/unreleased/Features-20220825-195023.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Search current working directory for `profiles.yml`
-time: 2022-08-25T19:50:23.940417-06:00
-custom:
-  Author: dbeatty10
-  Issue: "5411"
-  PR: "5717"

.changes/unreleased/Features-20220908-104149.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Adds new cli framework
-time: 2022-09-08T10:41:49.375734-05:00
-custom:
-  Author: iknox-fa
-  Issue: "5526"
-  PR: "5647"

.changes/unreleased/Features-20220908-123650.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Flags work with new Click CLI
-time: 2022-09-08T12:36:50.386978-05:00
-custom:
-  Author: iknox-fa
-  Issue: "5529"
-  PR: "5790"

.changes/unreleased/Features-20220909-204643.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Add metadata env method to ProviderContext class
-time: 2022-09-09T20:46:43.889302+01:00
-custom:
-  Author: jared-rimmer
-  Issue: "5522"
-  PR: "5794"

.changes/unreleased/Features-20220912-222227.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Array macros
-time: 2022-09-12T22:22:27.475515-06:00
-custom:
-  Author: graciegoheen dbeatty10
-  Issue: "5520"
-  PR: "5823"

.changes/unreleased/Features-20220913-095924.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Add enabled config to exposures and metrics
-time: 2022-09-13T09:59:24.445918-05:00
-custom:
-  Author: emmyoop
-  Issue: "5422"
-  PR: "5815"

.changes/unreleased/Features-20220919-112903.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: add -fr flag shorthand
-time: 2022-09-19T11:29:03.774678-05:00
-custom:
-  Author: dave-connors-3
-  Issue: "5878"
-  PR: "5879"

.changes/unreleased/Features-20220919-231414.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: add type_boolean as a data type macro
-time: 2022-09-19T23:14:14.9871+01:00
-custom:
-  Author: jpmmcneill
-  Issue: "5739"
-  PR: "5875"

.changes/unreleased/Features-20220921-145222.yaml

@@ -1,7 +0,0 @@
-kind: Features
-body: Support .dbtignore in project root to ignore certain files being read by dbt
-time: 2022-09-21T14:52:22.131627-07:00
-custom:
-  Author: ChenyuLInx
-  Issue: "5733"
-  PR: "5897"

.changes/unreleased/Features-20220926-130627.yaml

@@ -1,9 +0,0 @@
-kind: Features
-body: This conditionally no-ops warehouse connection at compile depending on an env
-  var, disabling introspection/queries during compilation only. This is a temporary
-  solution to more complex permissions requirements for the semantic layer.
-time: 2022-09-26T13:06:27.591061-05:00
-custom:
-  Author: racheldaniel
-  Issue: "5936"
-  PR: "5926"

.changes/unreleased/Fixes-20220822-194238.yaml

@@ -1,7 +0,0 @@
-kind: Fixes
-body: Fix typos of comments in core/dbt/adapters/
-time: 2022-08-22T19:42:38.593923+09:00
-custom:
-  Author: yoiki
-  Issue: "5690"
-  PR: "5693"

.changes/unreleased/Fixes-20220916-091723.yaml

@@ -1,7 +0,0 @@
-kind: Fixes
-body: Prevent event_history from holding references
-time: 2022-09-16T09:17:23.273847-04:00
-custom:
-  Author: gshank
-  Issue: "5848"
-  PR: "5858"

.changes/unreleased/Fixes-20220920-181856.yaml

@@ -1,7 +0,0 @@
-kind: Fixes
-body: ConfigSelectorMethod should check for bools
-time: 2022-09-20T18:18:56.630628+01:00
-custom:
-  Author: danielcmessias
-  Issue: "5890"
-  PR: "5889"

.changes/unreleased/Fixes-20220922-083926.yaml

@@ -1,7 +0,0 @@
-kind: Fixes
-body: shorthand for full refresh should be one character
-time: 2022-09-22T08:39:26.948671-05:00
-custom:
-  Author: dave-connors-3
-  Issue: "5878"
-  PR: "5908"

.changes/unreleased/Fixes-20220923-143226.yaml

@@ -1,7 +0,0 @@
-kind: Fixes
-body: Fix macro resolution order during static analysis for custom generic tests
-time: 2022-09-23T14:32:26.857376+02:00
-custom:
-  Author: jtcohen6
-  Issue: "5720"
-  PR: "5907"

.changes/unreleased/Fixes-20220923-174504.yaml

@@ -1,7 +0,0 @@
-kind: Fixes
-body: Fix race condition when invoking dbt via lib.py concurrently
-time: 2022-09-23T17:45:04.405026-04:00
-custom:
-  Author: drewbanin
-  Issue: "5919"
-  PR: "5921"

.changes/unreleased/Under the Hood-20220912-190341.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: remove key as reserved keyword from test_bool_or
-time: 2022-09-12T19:03:41.481601+02:00
-custom:
-  Author: sdebruyn
-  Issue: "5817"
-  PR: "5818"

.changes/unreleased/Under the Hood-20220913-111744.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: Compatibiltiy for metric attribute renaming
-time: 2022-09-13T11:17:44.953536+02:00
-custom:
-  Author: jtcohen6 callum-mcdata
-  Issue: "5807"
-  PR: "5825"

.changes/unreleased/Under the Hood-20220914-132632.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: Add name validation for metrics
-time: 2022-09-14T13:26:32.387524-05:00
-custom:
-  Author: emmyoop
-  Issue: "5456"
-  PR: "5841"

.changes/unreleased/Under the Hood-20220914-150058.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: Validate exposure name and add label
-time: 2022-09-14T15:00:58.982982-05:00
-custom:
-  Author: emmyoop
-  Issue: "5606"
-  PR: "5844"

.changes/unreleased/Under the Hood-20220914-193933.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: remove source quoting setting in adapter tests
-time: 2022-09-14T19:39:33.688385+02:00
-custom:
-  Author: sdebruyn
-  Issue: "5836"
-  PR: "5839"

.changes/unreleased/Under the Hood-20220916-154712.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: Adding validation for metric expression attribute
-time: 2022-09-16T15:47:12.799002-05:00
-custom:
-  Author: callum-mcdata
-  Issue: "5871"
-  PR: "5873"

.changes/unreleased/Under the Hood-20220920-144842.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: Profiling and Adapter Management work with Click CLI
-time: 2022-09-20T14:48:42.070256-05:00
-custom:
-  Author: iknox-fa
-  Issue: "5531"
-  PR: "5892"

.changes/unreleased/Under the Hood-20220923-133525.yaml

@@ -1,7 +0,0 @@
-kind: Under the Hood
-body: Reparse references to deleted metric
-time: 2022-09-23T13:35:25.681656-04:00
-custom:
-  Author: gshank
-  Issue: "5444"
-  PR: "5920"

.changie.yaml

@@ -44,7 +44,7 @@ custom:
 footerFormat: |
   {{- $contributorDict := dict }}
   {{- /* any names added to this list should be all lowercase for later matching purposes */}}
-  {{- $core_team := list "peterallenwebb" "emmyoop" "nathaniel-may" "gshank" "leahwicz" "chenyulinx" "stu-k" "iknox-fa" "versusfacit" "mcknight-42" "jtcohen6" "dependabot[bot]" "snyk-bot" }}
+  {{- $core_team := list "emmyoop" "nathaniel-may" "gshank" "leahwicz" "chenyulinx" "stu-k" "iknox-fa" "versusfacit" "mcknight-42" "jtcohen6" "dependabot[bot]" "snyk-bot" }}
   {{- range $change := .Changes }}
     {{- $authorList := splitList " " $change.Custom.Author }}
     {{- /* loop through all authors for a PR */}}

.github/workflows/jira-transition.yml

@@ -15,9 +15,6 @@ on:
   issues:
     types: [closed, deleted, reopened]
 
-# no special access is needed
-permissions: read-all
-
 jobs:
   call-label-action:
     uses: dbt-labs/jira-actions/.github/workflows/jira-transition.yml@main

.github/workflows/release.yml

@@ -20,9 +20,6 @@ on:
        description: 'The release version number (i.e. 1.0.0b1)'
        required: true
 
-permissions:
-  contents: write # this is the permission that allows creating a new release
-
 defaults:
   run:
     shell: bash

.github/workflows/schema-check.yml

@@ -21,9 +21,6 @@ on:
       - "*.latest"
       - "releases/*"
 
-# no special access is needed
-permissions: read-all
-
 env:
   LATEST_SCHEMA_PATH: ${{ github.workspace }}/new_schemas
   SCHEMA_DIFF_ARTIFACT: ${{ github.workspace }}//schema_schanges.txt

.github/workflows/stale.yml

@@ -3,10 +3,6 @@ on:
   schedule:
     - cron: "30 1 * * *"
 
-permissions:
-  issues: write
-  pull-requests: write
-
 jobs:
   stale:
     runs-on: ubuntu-latest

.github/workflows/version-bump.yml

@@ -20,10 +20,6 @@ on:
        description: 'The version number to bump to (ex. 1.2.0, 1.3.0b1)'
        required: true
 
-permissions:
-  contents: write
-  pull-requests: write
-
 jobs:
   bump:
     runs-on: ubuntu-latest

.gitignore

@@ -95,7 +95,6 @@ venv/
 
 # vscode
 .vscode/
-*.code-workspace
 
 # poetry
 pyproject.toml

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ exclude: ^test/
 
 # Force all unspecified python hooks to run python 3.8
 default_language_version:
-  python: python3
+  python: python3.8
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks

core/dbt/adapters/base/column.py

@@ -12,7 +12,6 @@ class Column:
         "TIMESTAMP": "TIMESTAMP",
         "FLOAT": "FLOAT",
         "INTEGER": "INT",
-        "BOOLEAN": "BOOLEAN",
     }
     column: str
     dtype: str

core/dbt/adapters/base/impl.py

@@ -1220,6 +1220,7 @@ class BaseAdapter(metaclass=AdapterMeta):
     def default_python_submission_method(self) -> str:
         raise NotImplementedError("default_python_submission_method is not specified")
 
+    @available.parse_none
     @log_code_execution
     def submit_python_job(self, parsed_model: dict, compiled_code: str) -> AdapterResponse:
         submission_method = parsed_model["config"].get(

core/dbt/adapters/cache.py

@@ -384,7 +384,7 @@ class RelationsCache:
         relation = self.relations.pop(old_key)
         new_key = new_relation.key()
 
-        # relation has to rename its innards, so it needs the _CachedRelation.
+        # relaton has to rename its innards, so it needs the _CachedRelation.
         relation.rename(new_relation)
         # update all the relations that refer to it
         for cached in self.relations.values():

core/dbt/adapters/factory.py

@@ -1,17 +1,23 @@
 import threading
-from contextlib import contextmanager
-from importlib import import_module
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Set, Type
+from importlib import import_module
+from typing import Type, Dict, Any, List, Optional, Set
 
-from dbt.adapters.base.plugin import AdapterPlugin
-from dbt.adapters.protocol import AdapterConfig, AdapterProtocol, RelationProtocol
-from dbt.contracts.connection import AdapterRequiredConfig, Credentials
+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.events.functions import fire_event
 from dbt.events.types import AdapterImportError, PluginLoadError
-from dbt.exceptions import InternalException, RuntimeException
-from dbt.include.global_project import PACKAGE_PATH as GLOBAL_PROJECT_PATH
-from dbt.include.global_project import PROJECT_NAME as GLOBAL_PROJECT_NAME
+from dbt.contracts.connection import Credentials, AdapterRequiredConfig
+from dbt.adapters.protocol import (
+    AdapterProtocol,
+    AdapterConfig,
+    RelationProtocol,
+)
+from dbt.adapters.base.plugin import AdapterPlugin
+
 
 Adapter = AdapterProtocol
 
@@ -58,7 +64,7 @@ class AdapterContainer:
             # if we failed to import the target module in particular, inform
             # the user about it via a runtime error
             if exc.name == "dbt.adapters." + name:
-                fire_event(AdapterImportError(exc=str(exc)))
+                fire_event(AdapterImportError(exc=exc))
                 raise RuntimeException(f"Could not find adapter type {name}!")
             # otherwise, the error had to have come from some underlying
             # library. Log the stack trace.
@@ -211,12 +217,3 @@ def get_adapter_package_names(name: Optional[str]) -> List[str]:
 
 def get_adapter_type_names(name: Optional[str]) -> List[str]:
     return FACTORY.get_adapter_type_names(name)
-
-
-@contextmanager
-def adapter_management():
-    reset_adapters()
-    try:
-        yield
-    finally:
-        cleanup_connections()

core/dbt/adapters/protocol.py

@@ -88,7 +88,7 @@ class AdapterProtocol(  # type: ignore[misc]
     ],
 ):
     # N.B. Technically these are ClassVars, but mypy doesn't support putting type vars in a
-    # ClassVar due to the restrictiveness of PEP-526
+    # ClassVar due to the restirctiveness of PEP-526
     # See: https://github.com/python/mypy/issues/5144
     AdapterSpecificConfigs: Type[AdapterConfig_T]
     Column: Type[Column_T]

core/dbt/cli/README.md

@@ -1 +0,0 @@
-TODO

core/dbt/cli/flags.py

@@ -1,44 +0,0 @@
-# TODO  Move this to /core/dbt/flags.py when we're ready to break things
-import os
-from dataclasses import dataclass
-from multiprocessing import get_context
-from pprint import pformat as pf
-
-from click import get_current_context
-
-if os.name != "nt":
-    # https://bugs.python.org/issue41567
-    import multiprocessing.popen_spawn_posix  # type: ignore  # noqa: F401
-
-
-@dataclass(frozen=True)
-class Flags:
-    def __init__(self, ctx=None) -> None:
-
-        if ctx is None:
-            ctx = get_current_context()
-
-        def assign_params(ctx):
-            """Recursively adds all click params to flag object"""
-            for param_name, param_value in ctx.params.items():
-                # N.B. You have to use the base MRO method (object.__setattr__) to set attributes
-                # when using frozen dataclasses.
-                # https://docs.python.org/3/library/dataclasses.html#frozen-instances
-                if hasattr(self, param_name):
-                    raise Exception(f"Duplicate flag names found in click command: {param_name}")
-                object.__setattr__(self, param_name.upper(), param_value)
-            if ctx.parent:
-                assign_params(ctx.parent)
-
-        assign_params(ctx)
-
-        # Hard coded flags
-        object.__setattr__(self, "WHICH", ctx.info_name)
-        object.__setattr__(self, "MP_CONTEXT", get_context("spawn"))
-
-        # Support console DO NOT TRACK initiave
-        if os.getenv("DO_NOT_TRACK", "").lower() in (1, "t", "true", "y", "yes"):
-            object.__setattr__(self, "ANONYMOUS_USAGE_STATS", False)
-
-    def __str__(self) -> str:
-        return str(pf(self.__dict__))

core/dbt/cli/main.py

@@ -1,412 +0,0 @@
-import inspect  # This is temporary for RAT-ing
-from copy import copy
-from pprint import pformat as pf  # This is temporary for RAT-ing
-
-import click
-from dbt.adapters.factory import adapter_management
-from dbt.cli import params as p
-from dbt.cli.flags import Flags
-from dbt.profiler import profiler
-
-
-def cli_runner():
-    # Alias "list" to "ls"
-    ls = copy(cli.commands["list"])
-    ls.hidden = True
-    cli.add_command(ls, "ls")
-
-    # Run the cli
-    cli()
-
-
-# dbt
-@click.group(
-    context_settings={"help_option_names": ["-h", "--help"]},
-    invoke_without_command=True,
-    no_args_is_help=True,
-    epilog="Specify one of these sub-commands and you can find more help from there.",
-)
-@click.pass_context
-@p.anonymous_usage_stats
-@p.cache_selected_only
-@p.debug
-@p.enable_legacy_logger
-@p.event_buffer_size
-@p.fail_fast
-@p.log_cache_events
-@p.log_format
-@p.macro_debugging
-@p.partial_parse
-@p.print
-@p.printer_width
-@p.quiet
-@p.record_timing_info
-@p.static_parser
-@p.use_colors
-@p.use_experimental_parser
-@p.version
-@p.version_check
-@p.warn_error
-@p.write_json
-def cli(ctx, **kwargs):
-    """An ELT tool for managing your SQL transformations and data models.
-    For more documentation on these commands, visit: docs.getdbt.com
-    """
-    incomplete_flags = Flags()
-
-    # Profiling
-    if incomplete_flags.RECORD_TIMING_INFO:
-        ctx.with_resource(profiler(enable=True, outfile=incomplete_flags.RECORD_TIMING_INFO))
-
-    # Adapter management
-    ctx.with_resource(adapter_management())
-
-    # Version info
-    if incomplete_flags.VERSION:
-        click.echo(f"`version` called\n ctx.params: {pf(ctx.params)}")
-        return
-    else:
-        del ctx.params["version"]
-
-
-# dbt build
-@cli.command("build")
-@click.pass_context
-@p.defer
-@p.exclude
-@p.fail_fast
-@p.full_refresh
-@p.indirect_selection
-@p.log_path
-@p.models
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.show
-@p.state
-@p.store_failures
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-def build(ctx, **kwargs):
-    """Run all Seeds, Models, Snapshots, and tests in DAG order"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt clean
-@cli.command("clean")
-@click.pass_context
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.target
-@p.vars
-def clean(ctx, **kwargs):
-    """Delete all folders in the clean-targets list (usually the dbt_packages and target directories.)"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt docs
-@cli.group()
-@click.pass_context
-def docs(ctx, **kwargs):
-    """Generate or serve the documentation website for your project"""
-
-
-# dbt docs generate
-@docs.command("generate")
-@click.pass_context
-@p.compile_docs
-@p.defer
-@p.exclude
-@p.log_path
-@p.models
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.state
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-def docs_generate(ctx, **kwargs):
-    """Generate the documentation website for your project"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt docs serve
-@docs.command("serve")
-@click.pass_context
-@p.browser
-@p.port
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.target
-@p.vars
-def docs_serve(ctx, **kwargs):
-    """Serve the documentation website for your project"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt compile
-@cli.command("compile")
-@click.pass_context
-@p.defer
-@p.exclude
-@p.full_refresh
-@p.log_path
-@p.models
-@p.parse_only
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.state
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-def compile(ctx, **kwargs):
-    """Generates executable SQL from source, model, test, and analysis files. Compiled SQL files are written to the target/ directory."""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt debug
-@cli.command("debug")
-@click.pass_context
-@p.config_dir
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.target
-@p.vars
-@p.version_check
-def debug(ctx, **kwargs):
-    """Show some helpful information about dbt for debugging. Not to be confused with the --debug option which increases verbosity."""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt deps
-@cli.command("deps")
-@click.pass_context
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.target
-@p.vars
-def deps(ctx, **kwargs):
-    """Pull the most recent version of the dependencies listed in packages.yml"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt init
-@cli.command("init")
-@click.pass_context
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.skip_profile_setup
-@p.target
-@p.vars
-def init(ctx, **kwargs):
-    """Initialize a new DBT project."""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt list
-@cli.command("list")
-@click.pass_context
-@p.exclude
-@p.indirect_selection
-@p.models
-@p.output
-@p.output_keys
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.resource_type
-@p.selector
-@p.state
-@p.target
-@p.vars
-def list(ctx, **kwargs):
-    """List the resources in your project"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt parse
-@cli.command("parse")
-@click.pass_context
-@p.compile_parse
-@p.log_path
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-@p.write_manifest
-def parse(ctx, **kwargs):
-    """Parses the project and provides information on performance"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt run
-@cli.command("run")
-@click.pass_context
-@p.defer
-@p.exclude
-@p.fail_fast
-@p.full_refresh
-@p.log_path
-@p.models
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.state
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-def run(ctx, **kwargs):
-    """Compile SQL and execute against the current target database."""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt run operation
-@cli.command("run-operation")
-@click.pass_context
-@p.args
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.target
-@p.vars
-def run_operation(ctx, **kwargs):
-    """Run the named macro with any supplied arguments."""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt seed
-@cli.command("seed")
-@click.pass_context
-@p.exclude
-@p.full_refresh
-@p.log_path
-@p.models
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.show
-@p.state
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-def seed(ctx, **kwargs):
-    """Load data from csv files into your data warehouse."""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt snapshot
-@cli.command("snapshot")
-@click.pass_context
-@p.defer
-@p.exclude
-@p.models
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.state
-@p.target
-@p.threads
-@p.vars
-def snapshot(ctx, **kwargs):
-    """Execute snapshots defined in your project"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt source
-@cli.group()
-@click.pass_context
-def source(ctx, **kwargs):
-    """Manage your project's sources"""
-
-
-# dbt source freshness
-@source.command("freshness")
-@click.pass_context
-@p.exclude
-@p.models
-@p.output_path  # TODO: Is this ok to re-use?  We have three different output params, how much can we consolidate?
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.state
-@p.target
-@p.threads
-@p.vars
-def freshness(ctx, **kwargs):
-    """Snapshots the current freshness of the project's sources"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# dbt test
-@cli.command("test")
-@click.pass_context
-@p.defer
-@p.exclude
-@p.fail_fast
-@p.indirect_selection
-@p.log_path
-@p.models
-@p.profile
-@p.profiles_dir
-@p.project_dir
-@p.selector
-@p.state
-@p.store_failures
-@p.target
-@p.target_path
-@p.threads
-@p.vars
-@p.version_check
-def test(ctx, **kwargs):
-    """Runs tests on data in deployed models. Run this after `dbt run`"""
-    flags = Flags()
-    click.echo(f"`{inspect.stack()[0][3]}` called\n flags: {flags}")
-
-
-# Support running as a module
-if __name__ == "__main__":
-    cli_runner()

core/dbt/cli/option_types.py

@@ -1,33 +0,0 @@
-from click import ParamType
-import yaml
-
-
-class YAML(ParamType):
-    """The Click YAML type. Converts YAML strings into objects."""
-
-    name = "YAML"
-
-    def convert(self, value, param, ctx):
-        # assume non-string values are a problem
-        if not isinstance(value, str):
-            self.fail(f"Cannot load YAML from type {type(value)}", param, ctx)
-        try:
-            return yaml.load(value, Loader=yaml.Loader)
-        except yaml.parser.ParserError:
-            self.fail(f"String '{value}' is not valid YAML", param, ctx)
-
-
-class Truthy(ParamType):
-    """The Click Truthy type.  Converts strings into a "truthy" type"""
-
-    name = "TRUTHY"
-
-    def convert(self, value, param, ctx):
-        # assume non-string / non-None values are a problem
-        if not isinstance(value, (str, None)):
-            self.fail(f"Cannot load TRUTHY from type {type(value)}", param, ctx)
-
-        if value is None or value.lower() in ("0", "false", "f"):
-            return None
-        else:
-            return value

core/dbt/cli/params.py

@@ -1,386 +0,0 @@
-from pathlib import Path, PurePath
-
-import click
-from dbt.cli.option_types import YAML
-from dbt.cli.resolvers import default_project_dir, default_profiles_dir
-
-
-# TODO:  The name (reflected in flags) is a correction!
-# The original name was `SEND_ANONYMOUS_USAGE_STATS` and used an env var called "DBT_SEND_ANONYMOUS_USAGE_STATS"
-# Both of which break existing naming conventions (doesn't match param flag).
-# This will need to be fixed before use in the main codebase and communicated as a change to the community!
-anonymous_usage_stats = click.option(
-    "--anonymous-usage-stats/--no-anonymous-usage-stats",
-    envvar="DBT_ANONYMOUS_USAGE_STATS",
-    help="Send anonymous usage stats to dbt Labs.",
-    default=True,
-)
-
-args = click.option(
-    "--args",
-    envvar=None,
-    help="Supply arguments to the macro. This dictionary will be mapped to the keyword arguments defined in the selected macro. This argument should be a YAML string, eg. '{my_variable: my_value}'",
-    type=YAML(),
-)
-
-browser = click.option(
-    "--browser/--no-browser",
-    envvar=None,
-    help="Wether or not to open a local web browser after starting the server",
-    default=True,
-)
-
-cache_selected_only = click.option(
-    "--cache-selected-only/--no-cache-selected-only",
-    envvar="DBT_CACHE_SELECTED_ONLY",
-    help="Pre cache database objects relevant to selected resource only.",
-)
-
-compile_docs = click.option(
-    "--compile/--no-compile",
-    envvar=None,
-    help="Wether or not to run 'dbt compile' as part of docs generation",
-    default=True,
-)
-
-compile_parse = click.option(
-    "--compile/--no-compile",
-    envvar=None,
-    help="TODO: No help text currently available",
-    default=True,
-)
-
-config_dir = click.option(
-    "--config-dir",
-    envvar=None,
-    help="If specified, DBT will show path information for this project",
-    type=click.STRING,
-)
-
-debug = click.option(
-    "--debug/--no-debug",
-    "-d/ ",
-    envvar="DBT_DEBUG",
-    help="Display debug logging during dbt execution. Useful for debugging and making bug reports.",
-)
-
-# TODO:  The env var and name (reflected in flags) are corrections!
-# The original name was `DEFER_MODE` and used an env var called "DBT_DEFER_TO_STATE"
-# Both of which break existing naming conventions.
-# This will need to be fixed before use in the main codebase and communicated as a change to the community!
-defer = click.option(
-    "--defer/--no-defer",
-    envvar="DBT_DEFER",
-    help="If set, defer to the state variable for resolving unselected nodes.",
-)
-
-enable_legacy_logger = click.option(
-    "--enable-legacy-logger/--no-enable-legacy-logger",
-    envvar="DBT_ENABLE_LEGACY_LOGGER",
-    hidden=True,
-)
-
-event_buffer_size = click.option(
-    "--event-buffer-size",
-    envvar="DBT_EVENT_BUFFER_SIZE",
-    help="Sets the max number of events to buffer in EVENT_HISTORY.",
-    default=100000,
-    type=click.INT,
-)
-
-exclude = click.option("--exclude", envvar=None, help="Specify the nodes to exclude.")
-
-fail_fast = click.option(
-    "--fail-fast/--no-fail-fast",
-    "-x/ ",
-    envvar="DBT_FAIL_FAST",
-    help="Stop execution on first failure.",
-)
-
-full_refresh = click.option(
-    "--full-refresh",
-    "-f",
-    envvar="DBT_FULL_REFRESH",
-    help="If specified, dbt will drop incremental models and fully-recalculate the incremental table from the model definition.",
-    is_flag=True,
-)
-
-indirect_selection = click.option(
-    "--indirect-selection",
-    envvar="DBT_INDIRECT_SELECTION",
-    help="Select all tests that are adjacent to selected resources, even if they those resources have been explicitly selected.",
-    type=click.Choice(["eager", "cautious"], case_sensitive=False),
-    default="eager",
-)
-
-log_cache_events = click.option(
-    "--log-cache-events/--no-log-cache-events",
-    help="Enable verbose adapter cache logging.",
-    envvar="DBT_LOG_CACHE_EVENTS",
-)
-
-log_format = click.option(
-    "--log-format",
-    envvar="DBT_LOG_FORMAT",
-    help="Specify the log format, overriding the command's default.",
-    type=click.Choice(["text", "json", "default"], case_sensitive=False),
-    default="default",
-)
-
-log_path = click.option(
-    "--log-path",
-    envvar="DBT_LOG_PATH",
-    help="Configure the 'log-path'. Only applies this setting for the current run. Overrides the 'DBT_LOG_PATH' if it is set.",
-    type=click.Path(),
-)
-
-macro_debugging = click.option(
-    "--macro-debugging/--no-macro-debugging",
-    envvar="DBT_MACRO_DEBUGGING",
-    hidden=True,
-)
-
-models = click.option(
-    "-m",
-    "-s",
-    "models",
-    envvar=None,
-    help="Specify the nodes to include.",
-    multiple=True,
-)
-
-output = click.option(
-    "--output",
-    envvar=None,
-    help="TODO: No current help text",
-    type=click.Choice(["json", "name", "path", "selector"], case_sensitive=False),
-    default="name",
-)
-
-output_keys = click.option(
-    "--output-keys", envvar=None, help="TODO: No current help text", type=click.STRING
-)
-
-output_path = click.option(
-    "--output",
-    "-o",
-    envvar=None,
-    help="Specify the output path for the json report. By default, outputs to 'target/sources.json'",
-    type=click.Path(file_okay=True, dir_okay=False, writable=True),
-    default=PurePath.joinpath(Path.cwd(), "target/sources.json"),
-)
-
-parse_only = click.option(
-    "--parse-only",
-    envvar=None,
-    help="TODO:  No help text currently available",
-    is_flag=True,
-)
-
-partial_parse = click.option(
-    "--partial-parse/--no-partial-parse",
-    envvar="DBT_PARTIAL_PARSE",
-    help="Allow for partial parsing by looking for and writing to a pickle file in the target directory. This overrides the user configuration file.",
-    default=True,
-)
-
-port = click.option(
-    "--port",
-    envvar=None,
-    help="Specify the port number for the docs server",
-    default=8080,
-    type=click.INT,
-)
-
-# TODO:  The env var and name (reflected in flags) are corrections!
-# The original name was `NO_PRINT` and used the env var `DBT_NO_PRINT`.
-# Both of which break existing naming conventions.
-# This will need to be fixed before use in the main codebase and communicated as a change to the community!
-print = click.option(
-    "--print/--no-print",
-    envvar="DBT_PRINT",
-    help="Output all {{ print() }} macro calls.",
-    default=True,
-)
-
-printer_width = click.option(
-    "--printer-width",
-    envvar="DBT_PRINTER_WIDTH",
-    help="Sets the width of terminal output",
-    type=click.INT,
-    default=80,
-)
-
-profile = click.option(
-    "--profile",
-    envvar=None,
-    help="Which profile to load. Overrides setting in dbt_project.yml.",
-)
-
-profiles_dir = click.option(
-    "--profiles-dir",
-    envvar="DBT_PROFILES_DIR",
-    help="Which directory to look in for the profiles.yml file. If not set, dbt will look in the current working directory first, then HOME/.dbt/",
-    default=default_profiles_dir(),
-    type=click.Path(exists=True),
-)
-
-project_dir = click.option(
-    "--project-dir",
-    envvar=None,
-    help="Which directory to look in for the dbt_project.yml file. Default is the current working directory and its parents.",
-    default=default_project_dir(),
-    type=click.Path(exists=True),
-)
-
-quiet = click.option(
-    "--quiet/--no-quiet",
-    envvar="DBT_QUIET",
-    help="Suppress all non-error logging to stdout. Does not affect {{ print() }} macro calls.",
-)
-
-record_timing_info = click.option(
-    "--record-timing-info",
-    "-r",
-    envvar=None,
-    help="When this option is passed, dbt will output low-level timing stats to the specified file. Example: `--record-timing-info output.profile`",
-    type=click.Path(exists=False),
-)
-
-resource_type = click.option(
-    "--resource-type",
-    envvar=None,
-    help="TODO: No current help text",
-    type=click.Choice(
-        [
-            "metric",
-            "source",
-            "analysis",
-            "model",
-            "test",
-            "exposure",
-            "snapshot",
-            "seed",
-            "default",
-            "all",
-        ],
-        case_sensitive=False,
-    ),
-    default="default",
-)
-
-selector = click.option(
-    "--selector", envvar=None, help="The selector name to use, as defined in selectors.yml"
-)
-
-show = click.option(
-    "--show", envvar=None, help="Show a sample of the loaded data in the terminal", is_flag=True
-)
-
-skip_profile_setup = click.option(
-    "--skip-profile-setup", "-s", envvar=None, help="Skip interative profile setup.", is_flag=True
-)
-
-# TODO:  The env var and name (reflected in flags) are corrections!
-# The original name was `ARTIFACT_STATE_PATH` and used the env var `DBT_ARTIFACT_STATE_PATH`.
-# Both of which break existing naming conventions.
-# This will need to be fixed before use in the main codebase and communicated as a change to the community!
-state = click.option(
-    "--state",
-    envvar="DBT_STATE",
-    help="If set, use the given directory as the source for json files to compare with this project.",
-    type=click.Path(
-        dir_okay=True,
-        exists=True,
-        file_okay=False,
-        readable=True,
-        resolve_path=True,
-    ),
-)
-
-static_parser = click.option(
-    "--static-parser/--no-static-parser",
-    envvar="DBT_STATIC_PARSER",
-    help="Use the static parser.",
-    default=True,
-)
-
-store_failures = click.option(
-    "--store-failures",
-    envvar="DBT_STORE_FAILURES",
-    help="Store test results (failing rows) in the database",
-    is_flag=True,
-)
-
-target = click.option(
-    "--target", "-t", envvar=None, help="Which target to load for the given profile"
-)
-
-target_path = click.option(
-    "--target-path",
-    envvar="DBT_TARGET_PATH",
-    help="Configure the 'target-path'. Only applies this setting for the current run. Overrides the 'DBT_TARGET_PATH' if it is set.",
-    type=click.Path(),
-)
-
-threads = click.option(
-    "--threads",
-    envvar=None,
-    help="Specify number of threads to use while executing models. Overrides settings in profiles.yml.",
-    default=1,
-    type=click.INT,
-)
-
-use_colors = click.option(
-    "--use-colors/--no-use-colors",
-    envvar="DBT_USE_COLORS",
-    help="Output is colorized by default and may also be set in a profile or at the command line.",
-    default=True,
-)
-
-use_experimental_parser = click.option(
-    "--use-experimental-parser/--no-use-experimental-parser",
-    envvar="DBT_USE_EXPERIMENTAL_PARSER",
-    help="Enable experimental parsing features.",
-)
-
-vars = click.option(
-    "--vars",
-    envvar=None,
-    help="Supply variables to the project. This argument overrides variables defined in your dbt_project.yml file. This argument should be a YAML string, eg. '{my_variable: my_value}'",
-    type=YAML(),
-)
-
-version = click.option(
-    "--version",
-    envvar=None,
-    help="Show version information",
-    is_flag=True,
-)
-
-version_check = click.option(
-    "--version-check/--no-version-check",
-    envvar="DBT_VERSION_CHECK",
-    help="Ensure dbt's version matches the one specified in the dbt_project.yml file ('require-dbt-version')",
-    default=True,
-)
-
-warn_error = click.option(
-    "--warn-error/--no-warn-error",
-    envvar="DBT_WARN_ERROR",
-    help="If dbt would normally warn, instead raise an exception. Examples include --models that selects nothing, deprecations, configurations with no associated models, invalid test configurations, and missing sources/refs in tests.",
-)
-
-write_json = click.option(
-    "--write-json/--no-write-json",
-    envvar="DBT_WRITE_JSON",
-    help="Writing the manifest and run_results.json files to disk",
-    default=True,
-)
-
-write_manifest = click.option(
-    "--write-manifest/--no-write-manifest",
-    envvar=None,
-    help="TODO: No help text currently available",
-    default=True,
-)

core/dbt/cli/resolvers.py

@@ -1,11 +0,0 @@
-from pathlib import Path
-
-
-def default_project_dir():
-    paths = list(Path.cwd().parents)
-    paths.insert(0, Path.cwd())
-    return next((x for x in paths if (x / "dbt_project.yml").exists()), Path.cwd())
-
-
-def default_profiles_dir():
-    return Path.cwd() if (Path.cwd() / "profiles.yml").exists() else Path.home() / ".dbt"

core/dbt/clients/jinja.py

@@ -27,7 +27,6 @@ from dbt.utils import (
 from dbt.clients._jinja_blocks import BlockIterator, BlockData, BlockTag
 from dbt.contracts.graph.compiled import CompiledGenericTestNode
 from dbt.contracts.graph.parsed import ParsedGenericTestNode
-
 from dbt.exceptions import (
     InternalException,
     raise_compiler_error,
@@ -306,13 +305,13 @@ class MacroGenerator(BaseMacroGenerator):
     @contextmanager
     def track_call(self):
         # This is only called from __call__
-        if self.stack is None:
+        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, when creating this dependency we don't pass in stack
-            if depth == 0 and self.node:
+            # only mark depth=0 as a dependency
+            if depth == 0:
                 self.node.depends_on.add_macro(unique_id)
             self.stack.push(unique_id)
             try:

core/dbt/clients/system.py

@@ -12,7 +12,6 @@ import tarfile
 import requests
 import stat
 from typing import Type, NoReturn, List, Optional, Dict, Any, Tuple, Callable, Union
-from pathspec import PathSpec  # type: ignore
 
 from dbt.events.functions import fire_event
 from dbt.events.types import (
@@ -37,7 +36,6 @@ def find_matching(
     root_path: str,
     relative_paths_to_search: List[str],
     file_pattern: str,
-    ignore_spec: Optional[PathSpec] = None,
 ) -> List[Dict[str, Any]]:
     """
     Given an absolute `root_path`, a list of relative paths to that
@@ -59,30 +57,19 @@ def find_matching(
     reobj = re.compile(regex, re.IGNORECASE)
 
     for relative_path_to_search in relative_paths_to_search:
-        # potential speedup for ignore_spec
-        # if ignore_spec.matches(relative_path_to_search):
-        #     continue
         absolute_path_to_search = os.path.join(root_path, relative_path_to_search)
         walk_results = os.walk(absolute_path_to_search)
 
         for current_path, subdirectories, local_files in walk_results:
-            # potential speedup for ignore_spec
-            # relative_dir = os.path.relpath(current_path, root_path) + os.sep
-            # if ignore_spec.match(relative_dir):
-            #     continue
             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)
-                relative_path_to_root = os.path.join(relative_path_to_search, relative_path)
-
                 modification_time = 0.0
                 try:
                     modification_time = os.path.getmtime(absolute_path)
                 except OSError:
                     fire_event(SystemErrorRetrievingModTime(path=absolute_path))
-                if reobj.match(local_file) and (
-                    not ignore_spec or not ignore_spec.match_file(relative_path_to_root)
-                ):
+                if reobj.match(local_file):
                     matching.append(
                         {
                             "searched_path": relative_path_to_search,
@@ -177,7 +164,7 @@ def write_file(path: str, contents: str = "") -> bool:
                 reason = "Path was possibly too long"
             # all our hard work and the path was still too long. Log and
             # continue.
-            fire_event(SystemCouldNotWrite(path=path, reason=reason, exc=str(exc)))
+            fire_event(SystemCouldNotWrite(path=path, reason=reason, exc=exc))
         else:
             raise
     return True

core/dbt/compilation.py

@@ -183,7 +183,6 @@ class Compiler:
 
         context = generate_runtime_model_context(node, self.config, manifest)
         context.update(extra_context)
-
         if isinstance(node, CompiledGenericTestNode):
             # for test nodes, add a special keyword args value to the context
             jinja.add_rendered_test_kwargs(context, node)
@@ -370,6 +369,11 @@ class Compiler:
         compiled_node = _compiled_type_for(node).from_dict(data)
 
         if compiled_node.language == ModelLanguage.python:
+            # TODO could we also 'minify' this code at all? just aesthetic, not functional
+
+            # quoating seems like something very specific to sql so far
+            # for all python implementations we are seeing there's no quating.
+            # TODO try to find better way to do this, given that
             original_quoting = self.config.quoting
             self.config.quoting = {key: False for key in original_quoting.keys()}
             context = self._create_node_context(compiled_node, manifest, extra_context)
@@ -380,19 +384,7 @@ class Compiler:
                 node,
             )
             # we should NOT jinja render the python model's 'raw code'
-
-            # if the user didn't specify an explicit `model(dbt, session)` function,
-            # we're going to treat the user code as a "script" and wrap it in that function now.
-            # TODO: this is the jankiest way of doing it, with zero AST magic
-            if node.meta.get("missing_model_function") is True:
-                raw_code_lines = node.raw_code.strip().split("\n")
-                raw_code_lines[-1] = f"return {raw_code_lines[-1]}"
-                raw_code_indented = "\n    ".join(raw_code_lines)
-                model_code = f"def model(dbt, session):\n    {raw_code_indented}"
-            else:
-                model_code = node.raw_code
-
-            compiled_node.compiled_code = f"{model_code}\n\n{postfix}"
+            compiled_node.compiled_code = f"{node.raw_code}\n\n{postfix}"
             # restore quoting settings in the end since context is lazy evaluated
             self.config.quoting = original_quoting
 

core/dbt/config/profile.py

@@ -23,6 +23,8 @@ from .renderer import ProfileRenderer
 
 DEFAULT_THREADS = 1
 
+DEFAULT_PROFILES_DIR = os.path.join(os.path.expanduser("~"), ".dbt")
+
 INVALID_PROFILE_MESSAGE = """
 dbt encountered an error while trying to read your profiles.yml file.
 
@@ -42,7 +44,7 @@ defined in your profiles.yml file. You can find profiles.yml here:
 
 {profiles_file}/profiles.yml
 """.format(
-    profiles_file=flags.DEFAULT_PROFILES_DIR
+    profiles_file=DEFAULT_PROFILES_DIR
 )
 
 

core/dbt/config/project.py

@@ -380,8 +380,6 @@ class PartialProject(RenderComponents):
         snapshots: Dict[str, Any]
         sources: Dict[str, Any]
         tests: Dict[str, Any]
-        metrics: Dict[str, Any]
-        exposures: Dict[str, Any]
         vars_value: VarProvider
 
         dispatch = cfg.dispatch
@@ -390,8 +388,6 @@ class PartialProject(RenderComponents):
         snapshots = cfg.snapshots
         sources = cfg.sources
         tests = cfg.tests
-        metrics = cfg.metrics
-        exposures = cfg.exposures
         if cfg.vars is None:
             vars_dict: Dict[str, Any] = {}
         else:
@@ -445,8 +441,6 @@ class PartialProject(RenderComponents):
             query_comment=query_comment,
             sources=sources,
             tests=tests,
-            metrics=metrics,
-            exposures=exposures,
             vars=vars_value,
             config_version=cfg.config_version,
             unrendered=unrendered,
@@ -549,8 +543,6 @@ class Project:
     snapshots: Dict[str, Any]
     sources: Dict[str, Any]
     tests: Dict[str, Any]
-    metrics: Dict[str, Any]
-    exposures: Dict[str, Any]
     vars: VarProvider
     dbt_version: List[VersionSpecifier]
     packages: Dict[str, Any]
@@ -623,8 +615,6 @@ class Project:
                 "snapshots": self.snapshots,
                 "sources": self.sources,
                 "tests": self.tests,
-                "metrics": self.metrics,
-                "exposures": self.exposures,
                 "vars": self.vars.to_dict(),
                 "require-dbt-version": [v.to_version_string() for v in self.dbt_version],
                 "config-version": self.config_version,

core/dbt/config/runtime.py

@@ -105,8 +105,6 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
             query_comment=project.query_comment,
             sources=project.sources,
             tests=project.tests,
-            metrics=project.metrics,
-            exposures=project.exposures,
             vars=project.vars,
             config_version=project.config_version,
             unrendered=project.unrendered,
@@ -276,8 +274,6 @@ class RuntimeConfig(Project, Profile, AdapterRequiredConfig):
             "snapshots": self._get_config_paths(self.snapshots),
             "sources": self._get_config_paths(self.sources),
             "tests": self._get_config_paths(self.tests),
-            "metrics": self._get_config_paths(self.metrics),
-            "exposures": self._get_config_paths(self.exposures),
         }
 
     def get_unused_resource_config_paths(
@@ -481,8 +477,6 @@ class UnsetProfileConfig(RuntimeConfig):
                 "snapshots": self.snapshots,
                 "sources": self.sources,
                 "tests": self.tests,
-                "metrics": self.metrics,
-                "exposures": self.exposures,
                 "vars": self.vars.to_dict(),
                 "require-dbt-version": [v.to_version_string() for v in self.dbt_version],
                 "config-version": self.config_version,
@@ -543,8 +537,6 @@ class UnsetProfileConfig(RuntimeConfig):
             query_comment=project.query_comment,
             sources=project.sources,
             tests=project.tests,
-            metrics=project.metrics,
-            exposures=project.exposures,
             vars=project.vars,
             config_version=project.config_version,
             unrendered=project.unrendered,

core/dbt/context/context_config.py

@@ -43,12 +43,9 @@ class UnrenderedConfig(ConfigSource):
             model_configs = unrendered.get("sources")
         elif resource_type == NodeType.Test:
             model_configs = unrendered.get("tests")
-        elif resource_type == NodeType.Metric:
-            model_configs = unrendered.get("metrics")
-        elif resource_type == NodeType.Exposure:
-            model_configs = unrendered.get("exposures")
         else:
             model_configs = unrendered.get("models")
+
         if model_configs is None:
             return {}
         else:
@@ -68,10 +65,6 @@ class RenderedConfig(ConfigSource):
             model_configs = self.project.sources
         elif resource_type == NodeType.Test:
             model_configs = self.project.tests
-        elif resource_type == NodeType.Metric:
-            model_configs = self.project.metrics
-        elif resource_type == NodeType.Exposure:
-            model_configs = self.project.exposures
         else:
             model_configs = self.project.models
         return model_configs

core/dbt/context/macro_resolver.py

@@ -109,15 +109,9 @@ class MacroResolver:
 
     def get_macro(self, local_package, macro_name):
         local_package_macros = {}
-        # If the macro is explicitly prefixed with an internal namespace
-        # (e.g. 'dbt.some_macro'), look there first
-        if local_package in self.internal_package_names:
-            local_package_macros = self.internal_packages[local_package]
-        # If the macro is explicitly prefixed with a different package name
-        # (e.g. 'dbt_utils.some_macro'), look there first
         if local_package not in self.internal_package_names and local_package in self.packages:
             local_package_macros = self.packages[local_package]
-        # First: search the specified package for this macro
+        # First: search the local packages for this macro
         if macro_name in local_package_macros:
             return local_package_macros[macro_name]
         # Now look up in the standard search order

core/dbt/context/manifest.py

@@ -4,7 +4,6 @@ from dbt.clients.jinja import MacroStack
 from dbt.contracts.connection import AdapterRequiredConfig
 from dbt.contracts.graph.manifest import Manifest
 from dbt.context.macro_resolver import TestMacroNamespace
-from .base import contextproperty
 
 
 from .configured import ConfiguredContext
@@ -67,10 +66,6 @@ class ManifestContext(ConfiguredContext):
             dct.update(self.namespace)
         return dct
 
-    @contextproperty
-    def context_macro_stack(self):
-        return self.macro_stack
-
 
 class QueryHeaderContext(ManifestContext):
     def __init__(self, config: AdapterRequiredConfig, manifest: Manifest) -> None:

core/dbt/context/providers.py

@@ -41,7 +41,6 @@ from dbt.contracts.graph.parsed import (
     ParsedSourceDefinition,
 )
 from dbt.contracts.graph.metrics import MetricReference, ResolvedMetricReference
-from dbt.contracts.util import get_metadata_env
 from dbt.exceptions import (
     CompilationException,
     ParsingException,
@@ -711,10 +710,6 @@ class ProviderContext(ManifestContext):
             self.model,
         )
 
-    @contextproperty
-    def dbt_metadata_envs(self) -> Dict[str, str]:
-        return get_metadata_env()
-
     @contextproperty
     def invocation_args_dict(self):
         return args_to_dict(self.config.args)
@@ -1249,19 +1244,6 @@ class ProviderContext(ManifestContext):
         """
         return selected_resources.SELECTED_RESOURCES
 
-    @contextmember
-    def submit_python_job(self, parsed_model: Dict, compiled_code: str) -> AdapterResponse:
-        # Check macro_stack and that the unique id is for a materialization macro
-        if not (
-            self.context_macro_stack.depth == 2
-            and self.context_macro_stack.call_stack[1] == "macro.dbt.statement"
-            and "materialization" in self.context_macro_stack.call_stack[0]
-        ):
-            raise RuntimeException(
-                f"submit_python_job is not intended to be called here, at model {parsed_model['alias']}, with macro call_stack {self.context_macro_stack.call_stack}."
-            )
-        return self.adapter.submit_python_job(parsed_model, compiled_code)
-
 
 class MacroContext(ProviderContext):
     """Internally, macros can be executed like nodes, with some restrictions:

core/dbt/contracts/files.py

@@ -114,34 +114,25 @@ class FileHash(dbtClassMixin):
 
 @dataclass
 class RemoteFile(dbtClassMixin):
-    def __init__(self, language) -> None:
-        if language == "sql":
-            self.path_end = ".sql"
-        elif language == "python":
-            self.path_end = ".py"
-        else:
-            raise RuntimeError(f"Invalid language for remote File {language}")
-        self.path = f"from remote system{self.path_end}"
-
     @property
     def searched_path(self) -> str:
-        return self.path
+        return "from remote system"
 
     @property
     def relative_path(self) -> str:
-        return self.path
+        return "from remote system"
 
     @property
     def absolute_path(self) -> str:
-        return self.path
+        return "from remote system"
 
     @property
     def original_file_path(self):
-        return self.path
+        return "from remote system"
 
     @property
     def modification_time(self):
-        return self.path
+        return "from remote system"
 
 
 @dataclass
@@ -211,9 +202,9 @@ class SourceFile(BaseSourceFile):
     # TODO: do this a different way. This remote file kludge isn't going
     # to work long term
     @classmethod
-    def remote(cls, contents: str, project_name: str, language: str) -> "SourceFile":
+    def remote(cls, contents: str, project_name: str) -> "SourceFile":
         self = cls(
-            path=RemoteFile(language),
+            path=RemoteFile(),
             checksum=FileHash.from_contents(contents),
             project_name=project_name,
             contents=contents,
@@ -277,13 +268,11 @@ class SchemaSourceFile(BaseSourceFile):
             self.tests[key][name] = []
         self.tests[key][name].append(node_unique_id)
 
-    # this is only used in unit tests
     def remove_tests(self, yaml_key, name):
         if yaml_key in self.tests:
             if name in self.tests[yaml_key]:
                 del self.tests[yaml_key][name]
 
-    # this is only used in tests (unit + functional)
     def get_tests(self, yaml_key, name):
         if yaml_key in self.tests:
             if name in self.tests[yaml_key]:

core/dbt/contracts/graph/manifest.py

@@ -33,7 +33,6 @@ from dbt.contracts.graph.parsed import (
     ParsedMacro,
     ParsedDocumentation,
     ParsedSourceDefinition,
-    ParsedGenericTestNode,
     ParsedExposure,
     ParsedMetric,
     HasUniqueID,
@@ -217,7 +216,7 @@ class MetricLookup(dbtClassMixin):
         return manifest.metrics[unique_id]
 
 
-# This handles both models/seeds/snapshots and sources/metrics/exposures
+# This handles both models/seeds/snapshots and sources
 class DisabledLookup(dbtClassMixin):
     def __init__(self, manifest: "Manifest"):
         self.storage: Dict[str, Dict[PackageName, List[Any]]] = {}
@@ -465,7 +464,7 @@ class Disabled(Generic[D]):
     target: D
 
 
-MaybeMetricNode = Optional[Union[ParsedMetric, Disabled[ParsedMetric]]]
+MaybeMetricNode = Optional[ParsedMetric]
 
 
 MaybeDocumentation = Optional[ParsedDocumentation]
@@ -617,7 +616,7 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     flat_graph: Dict[str, Any] = field(default_factory=dict)
     state_check: ManifestStateCheck = field(default_factory=ManifestStateCheck)
     source_patches: MutableMapping[SourceKey, SourcePatch] = field(default_factory=dict)
-    disabled: MutableMapping[str, List[GraphMemberNode]] = field(default_factory=dict)
+    disabled: MutableMapping[str, List[CompileResultNode]] = field(default_factory=dict)
     env_vars: MutableMapping[str, str] = field(default_factory=dict)
 
     _doc_lookup: Optional[DocLookup] = field(
@@ -965,22 +964,13 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
         current_project: str,
         node_package: str,
     ) -> MaybeMetricNode:
-
         metric: Optional[ParsedMetric] = None
-        disabled: Optional[List[ParsedMetric]] = None
 
         candidates = _search_packages(current_project, node_package, target_metric_package)
         for pkg in candidates:
             metric = self.metric_lookup.find(target_metric_name, pkg, self)
-
-            if metric is not None and metric.config.enabled:
+            if metric is not None:
                 return metric
-
-            # it's possible that the node is disabled
-            if disabled is None:
-                disabled = self.disabled_lookup.find(f"{target_metric_name}", pkg)
-        if disabled:
-            return Disabled(disabled[0])
         return None
 
     # Called by DocsRuntimeContext.doc
@@ -1103,7 +1093,7 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
         self.metrics[metric.unique_id] = metric
         source_file.metrics.append(metric.unique_id)
 
-    def add_disabled_nofile(self, node: GraphMemberNode):
+    def add_disabled_nofile(self, node: CompileResultNode):
         # There can be multiple disabled nodes for the same unique_id
         if node.unique_id in self.disabled:
             self.disabled[node.unique_id].append(node)
@@ -1113,13 +1103,8 @@ class Manifest(MacroMethods, DataClassMessagePackMixin, dbtClassMixin):
     def add_disabled(self, source_file: AnySourceFile, node: CompileResultNode, test_from=None):
         self.add_disabled_nofile(node)
         if isinstance(source_file, SchemaSourceFile):
-            if isinstance(node, ParsedGenericTestNode):
-                assert test_from
-                source_file.add_test(node.unique_id, test_from)
-            if isinstance(node, ParsedMetric):
-                source_file.metrics.append(node.unique_id)
-            if isinstance(node, ParsedExposure):
-                source_file.exposures.append(node.unique_id)
+            assert test_from
+            source_file.add_test(node.unique_id, test_from)
         else:
             source_file.nodes.append(node.unique_id)
 

core/dbt/contracts/graph/model_config.py

@@ -363,16 +363,6 @@ class BaseConfig(AdditionalPropertiesAllowed, Replaceable):
         return self.from_dict(dct)
 
 
-@dataclass
-class MetricConfig(BaseConfig):
-    enabled: bool = True
-
-
-@dataclass
-class ExposureConfig(BaseConfig):
-    enabled: bool = True
-
-
 @dataclass
 class SourceConfig(BaseConfig):
     enabled: bool = True
@@ -623,8 +613,6 @@ class SnapshotConfig(EmptySnapshotConfig):
 
 
 RESOURCE_TYPES: Dict[NodeType, Type[BaseConfig]] = {
-    NodeType.Metric: MetricConfig,
-    NodeType.Exposure: ExposureConfig,
     NodeType.Source: SourceConfig,
     NodeType.Seed: SeedConfig,
     NodeType.Test: TestConfig,

core/dbt/contracts/graph/parsed.py

@@ -50,8 +50,6 @@ from .model_config import (
     SeedConfig,
     TestConfig,
     SourceConfig,
-    MetricConfig,
-    ExposureConfig,
     EmptySnapshotConfig,
     SnapshotConfig,
 )
@@ -745,12 +743,9 @@ class ParsedExposure(UnparsedBaseNode, HasUniqueID, HasFqn):
     owner: ExposureOwner
     resource_type: NodeType = NodeType.Exposure
     description: str = ""
-    label: Optional[str] = None
     maturity: Optional[MaturityType] = None
     meta: Dict[str, Any] = field(default_factory=dict)
     tags: List[str] = field(default_factory=list)
-    config: ExposureConfig = field(default_factory=ExposureConfig)
-    unrendered_config: Dict[str, Any] = field(default_factory=dict)
     url: Optional[str] = None
     depends_on: DependsOn = field(default_factory=DependsOn)
     refs: List[List[str]] = field(default_factory=list)
@@ -771,9 +766,6 @@ class ParsedExposure(UnparsedBaseNode, HasUniqueID, HasFqn):
     def same_description(self, old: "ParsedExposure") -> bool:
         return self.description == old.description
 
-    def same_label(self, old: "ParsedExposure") -> bool:
-        return self.label == old.label
-
     def same_maturity(self, old: "ParsedExposure") -> bool:
         return self.maturity == old.maturity
 
@@ -786,12 +778,6 @@ class ParsedExposure(UnparsedBaseNode, HasUniqueID, HasFqn):
     def same_url(self, old: "ParsedExposure") -> bool:
         return self.url == old.url
 
-    def same_config(self, old: "ParsedExposure") -> bool:
-        return self.config.same_contents(
-            self.unrendered_config,
-            old.unrendered_config,
-        )
-
     def same_contents(self, old: Optional["ParsedExposure"]) -> bool:
         # existing when it didn't before is a change!
         # metadata/tags changes are not "changes"
@@ -805,9 +791,7 @@ class ParsedExposure(UnparsedBaseNode, HasUniqueID, HasFqn):
             and self.same_maturity(old)
             and self.same_url(old)
             and self.same_description(old)
-            and self.same_label(old)
             and self.same_depends_on(old)
-            and self.same_config(old)
             and True
         )
 
@@ -824,19 +808,17 @@ class ParsedMetric(UnparsedBaseNode, HasUniqueID, HasFqn):
     description: str
     label: str
     calculation_method: str
-    timestamp: str
     expression: str
+    timestamp: Optional[str]
     filters: List[MetricFilter]
     time_grains: List[str]
     dimensions: List[str]
-    window: Optional[MetricTime] = None
+    window: Optional[MetricTime]
     model: Optional[str] = None
     model_unique_id: Optional[str] = None
     resource_type: NodeType = NodeType.Metric
     meta: Dict[str, Any] = field(default_factory=dict)
     tags: List[str] = field(default_factory=list)
-    config: MetricConfig = field(default_factory=MetricConfig)
-    unrendered_config: Dict[str, Any] = field(default_factory=dict)
     sources: List[List[str]] = field(default_factory=list)
     depends_on: DependsOn = field(default_factory=DependsOn)
     refs: List[List[str]] = field(default_factory=list)
@@ -881,12 +863,6 @@ class ParsedMetric(UnparsedBaseNode, HasUniqueID, HasFqn):
     def same_time_grains(self, old: "ParsedMetric") -> bool:
         return self.time_grains == old.time_grains
 
-    def same_config(self, old: "ParsedMetric") -> bool:
-        return self.config.same_contents(
-            self.unrendered_config,
-            old.unrendered_config,
-        )
-
     def same_contents(self, old: Optional["ParsedMetric"]) -> bool:
         # existing when it didn't before is a change!
         # metadata/tags changes are not "changes"
@@ -904,7 +880,6 @@ class ParsedMetric(UnparsedBaseNode, HasUniqueID, HasFqn):
             and self.same_expression(old)
             and self.same_timestamp(old)
             and self.same_time_grains(old)
-            and self.same_config(old)
             and True
         )
 

core/dbt/contracts/graph/unparsed.py

@@ -1,13 +1,5 @@
-import re
-
-from dbt import deprecations
 from dbt.node_types import NodeType
-from dbt.contracts.util import (
-    AdditionalPropertiesMixin,
-    Mergeable,
-    Replaceable,
-    rename_metric_attr,
-)
+from dbt.contracts.util import AdditionalPropertiesMixin, Mergeable, Replaceable
 
 # trigger the PathEncoder
 import dbt.helper_types  # noqa:F401
@@ -437,21 +429,11 @@ class UnparsedExposure(dbtClassMixin, Replaceable):
     type: ExposureType
     owner: ExposureOwner
     description: str = ""
-    label: Optional[str] = None
     maturity: Optional[MaturityType] = None
     meta: Dict[str, Any] = field(default_factory=dict)
     tags: List[str] = field(default_factory=list)
     url: Optional[str] = None
     depends_on: List[str] = field(default_factory=list)
-    config: Dict[str, Any] = field(default_factory=dict)
-
-    @classmethod
-    def validate(cls, data):
-        super(UnparsedExposure, cls).validate(data)
-        if "name" in data:
-            # name can only contain alphanumeric chars and underscores
-            if not (re.match(r"[\w-]+$", data["name"])):
-                deprecations.warn("exposure-name", exposure=data["name"])
 
 
 @dataclass
@@ -483,12 +465,15 @@ class MetricTime(dbtClassMixin, Mergeable):
 
 @dataclass
 class UnparsedMetric(dbtClassMixin, Replaceable):
+    # TODO : verify that this disallows metric names with spaces
+    # TODO: fix validation that you broke :p
+    # name: Identifier
     name: str
     label: str
     calculation_method: str
     timestamp: str
-    expression: str
     description: str = ""
+    expression: Union[str, int] = ""
     time_grains: List[str] = field(default_factory=list)
     dimensions: List[str] = field(default_factory=list)
     window: Optional[MetricTime] = None
@@ -496,29 +481,19 @@ class UnparsedMetric(dbtClassMixin, Replaceable):
     filters: List[MetricFilter] = field(default_factory=list)
     meta: Dict[str, Any] = field(default_factory=dict)
     tags: List[str] = field(default_factory=list)
-    config: Dict[str, Any] = field(default_factory=dict)
 
     @classmethod
     def validate(cls, data):
-        data = rename_metric_attr(data, raise_deprecation_warning=True)
+        # super().validate(data)
+        # TODO: putting this back for now to get tests passing.  Do we want to implement name: Identifier?
         super(UnparsedMetric, cls).validate(data)
-        if "name" in data:
-            errors = []
-            if " " in data["name"]:
-                errors.append("cannot contain spaces")
-            # This handles failing queries due to too long metric names.
-            # It only occurs in BigQuery and Snowflake (Postgres/Redshift truncate)
-            if len(data["name"]) > 250:
-                errors.append("cannot contain more than 250 characters")
-            if not (re.match(r"^[A-Za-z]", data["name"])):
-                errors.append("must begin with a letter")
-            if not (re.match(r"[\w-]+$", data["name"])):
-                errors.append("must contain only letters, numbers and underscores")
+        if "name" in data and " " in data["name"]:
+            raise ParsingException(f"Metrics name '{data['name']}' cannot contain spaces")
 
-            if errors:
-                raise ParsingException(
-                    f"The metric name '{data['name']}' is invalid.  It {', '.join(e for e in errors)}"
-                )
+        if data.get("calculation_method") == "expression":
+            raise ValidationError(
+                "The metric calculation method expression has been deprecated and renamed to derived. Please update"
+            )
 
         if data.get("model") is None and data.get("calculation_method") != "derived":
             raise ValidationError("Non-derived metrics require a 'model' property")

core/dbt/contracts/project.py

@@ -192,8 +192,6 @@ class Project(HyphenatedDbtClassMixin, Replaceable):
     analyses: Dict[str, Any] = field(default_factory=dict)
     sources: Dict[str, Any] = field(default_factory=dict)
     tests: Dict[str, Any] = field(default_factory=dict)
-    metrics: Dict[str, Any] = field(default_factory=dict)
-    exposures: Dict[str, Any] = field(default_factory=dict)
     vars: Optional[Dict[str, Any]] = field(
         default=None,
         metadata=dict(
@@ -236,7 +234,6 @@ class UserConfig(ExtensibleDbtClassMixin, Replaceable, UserConfigContract):
     static_parser: Optional[bool] = None
     indirect_selection: Optional[str] = None
     cache_selected_only: Optional[bool] = None
-    event_buffer_size: Optional[int] = None
 
 
 @dataclass

core/dbt/contracts/util.py

@@ -4,7 +4,6 @@ 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 import deprecations
 from dbt.exceptions import (
     InternalException,
     RuntimeException,
@@ -208,60 +207,13 @@ def get_manifest_schema_version(dct: dict) -> int:
     return int(schema_version.split(".")[-2][-1])
 
 
-# we renamed these properties in v1.3
-# this method allows us to be nice to the early adopters
-def rename_metric_attr(data: dict, raise_deprecation_warning: bool = False) -> dict:
-    metric_name = data["name"]
-    if raise_deprecation_warning and (
-        "sql" in data.keys()
-        or "type" in data.keys()
-        or data.get("calculation_method") == "expression"
-    ):
-        deprecations.warn("metric-attr-renamed", metric_name=metric_name)
-    duplicated_attribute_msg = """\n
-The metric '{}' contains both the deprecated metric property '{}'
-and the up-to-date metric property '{}'. Please remove the deprecated property.
-"""
-    if "sql" in data.keys():
-        if "expression" in data.keys():
-            raise ValidationError(
-                duplicated_attribute_msg.format(metric_name, "sql", "expression")
-            )
-        else:
-            data["expression"] = data.pop("sql")
-    if "type" in data.keys():
-        if "calculation_method" in data.keys():
-            raise ValidationError(
-                duplicated_attribute_msg.format(metric_name, "type", "calculation_method")
-            )
-        else:
-            calculation_method = data.pop("type")
-            data["calculation_method"] = calculation_method
-    # we also changed "type: expression" -> "calculation_method: derived"
-    if data.get("calculation_method") == "expression":
-        data["calculation_method"] = "derived"
-    return data
-
-
-def rename_sql_attr(node_content: dict) -> dict:
-    if "raw_sql" in node_content:
-        node_content["raw_code"] = node_content.pop("raw_sql")
-    if "compiled_sql" in node_content:
-        node_content["compiled_code"] = node_content.pop("compiled_sql")
-    node_content["language"] = "sql"
-    return node_content
-
-
 def upgrade_manifest_json(manifest: dict) -> dict:
     for node_content in manifest.get("nodes", {}).values():
-        node_content = rename_sql_attr(node_content)
-    for disabled in manifest.get("disabled", {}).values():
-        # There can be multiple disabled nodes for the same unique_id
-        # so make sure all the nodes get the attr renamed
-        disabled = [rename_sql_attr(n) for n in disabled]
-    for metric_content in manifest.get("metrics", {}).values():
-        # handle attr renames + value translation ("expression" -> "derived")
-        metric_content = rename_metric_attr(metric_content)
+        if "raw_sql" in node_content:
+            node_content["raw_code"] = node_content.pop("raw_sql")
+        if "compiled_sql" in node_content:
+            node_content["compiled_code"] = node_content.pop("compiled_sql")
+        node_content["language"] = "sql"
     return manifest
 
 

core/dbt/deprecations.py

@@ -87,30 +87,6 @@ def renamed_method(old_name: str, new_name: str):
     deprecations[dep.name] = dep
 
 
-class MetricAttributesRenamed(DBTDeprecation):
-    _name = "metric-attr-renamed"
-    _description = """\
-dbt-core v1.3 renamed attributes for metrics:
-\n  'sql'              -> 'expression'
-\n  'type'             -> 'calculation_method'
-\n  'type: expression' -> 'calculation_method: derived'
-\nThe old metric parameter names will be fully deprecated in v1.4.
-\nPlease remove them from the metric definition of metric '{metric_name}'
-\nRelevant issue here: https://github.com/dbt-labs/dbt-core/issues/5849
-"""
-
-
-class ExposureNameDeprecation(DBTDeprecation):
-    _name = "exposure-name"
-    _description = """\
-    Starting in v1.3, the 'name' of an exposure should contain only letters, numbers, and underscores.
-    Exposures support a new property, 'label', which may contain spaces, capital letters, and special characters.
-    {exposure} does not follow this pattern.
-    Please update the 'name', and use the 'label' property for a human-friendly title.
-    This will raise an error in a future version of dbt-core.
-    """
-
-
 def warn(name, *args, **kwargs):
     if name not in deprecations:
         # this should (hopefully) never happen
@@ -125,12 +101,10 @@ def warn(name, *args, **kwargs):
 active_deprecations: Set[str] = set()
 
 deprecations_list: List[DBTDeprecation] = [
-    ExposureNameDeprecation(),
     ConfigSourcePathDeprecation(),
     ConfigDataPathDeprecation(),
     PackageInstallPathDeprecation(),
     PackageRedirectDeprecation(),
-    MetricAttributesRenamed(),
 ]
 
 deprecations: Dict[str, DBTDeprecation] = {d.name: d for d in deprecations_list}

core/dbt/events/functions.py

@@ -1,7 +1,7 @@
 from colorama import Style
 import dbt.events.functions as this  # don't worry I hate it too.
 from dbt.events.base_types import NoStdOut, Event, NoFile, ShowException, Cache
-from dbt.events.types import T_Event, MainReportVersion, EmptyLine, EventBufferFull
+from dbt.events.types import EventBufferFull, T_Event, MainReportVersion, EmptyLine
 import dbt.flags as flags
 from dbt.constants import SECRET_ENV_PREFIX
 
@@ -22,16 +22,24 @@ import threading
 from typing import Any, Dict, List, Optional, Union
 from collections import deque
 
+global LOG_VERSION
 LOG_VERSION = 2
-EVENT_HISTORY = None
+
+# create the global event history buffer with the default max size (10k)
+# python 3.7 doesn't support type hints on globals, but mypy requires them. hence the ignore.
+# TODO the flags module has not yet been resolved when this is created
+global EVENT_HISTORY
+EVENT_HISTORY = deque(maxlen=flags.EVENT_BUFFER_SIZE)  # type: ignore
 
 # create the global file logger with no configuration
+global FILE_LOG
 FILE_LOG = logging.getLogger("default_file")
 null_handler = logging.NullHandler()
 FILE_LOG.addHandler(null_handler)
 
 # set up logger to go to stdout with defaults
 # setup_event_logger will be called once args have been parsed
+global STDOUT_LOG
 STDOUT_LOG = logging.getLogger("default_stdout")
 STDOUT_LOG.setLevel(logging.INFO)
 stdout_handler = logging.StreamHandler(sys.stdout)
@@ -44,6 +52,10 @@ invocation_id: Optional[str] = None
 
 
 def setup_event_logger(log_path, level_override=None):
+    # flags have been resolved, and log_path is known
+    global EVENT_HISTORY
+    EVENT_HISTORY = deque(maxlen=flags.EVENT_BUFFER_SIZE)  # type: ignore
+
     make_log_dir_if_missing(log_path)
 
     this.format_json = flags.LOG_FORMAT == "json"
@@ -259,7 +271,14 @@ def fire_event(e: Event) -> None:
     if isinstance(e, Cache) and not flags.LOG_CACHE_EVENTS:
         return
 
-    add_to_event_history(e)
+    # if and only if the event history deque will be completely filled by this event
+    # fire warning that old events are now being dropped
+    global EVENT_HISTORY
+    if len(EVENT_HISTORY) == (flags.EVENT_BUFFER_SIZE - 1):
+        EVENT_HISTORY.append(e)
+        fire_event(EventBufferFull())
+    else:
+        EVENT_HISTORY.append(e)
 
     # backwards compatibility for plugins that require old logger (dbt-rpc)
     if flags.ENABLE_LEGACY_LOGGER:
@@ -325,20 +344,3 @@ def get_ts_rfc3339() -> str:
     ts = get_ts()
     ts_rfc3339 = ts.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
     return ts_rfc3339
-
-
-def add_to_event_history(event):
-    if flags.EVENT_BUFFER_SIZE == 0:
-        return
-    global EVENT_HISTORY
-    if EVENT_HISTORY is None:
-        reset_event_history()
-    EVENT_HISTORY.append(event)
-    # We only set the EventBufferFull message for event buffers >= 10,000
-    if flags.EVENT_BUFFER_SIZE >= 10000 and len(EVENT_HISTORY) == (flags.EVENT_BUFFER_SIZE - 1):
-        fire_event(EventBufferFull())
-
-
-def reset_event_history():
-    global EVENT_HISTORY
-    EVENT_HISTORY = deque(maxlen=flags.EVENT_BUFFER_SIZE)

core/dbt/events/types.py

@@ -103,11 +103,11 @@ class MainKeyboardInterrupt(InfoLevel):
 
 @dataclass
 class MainEncounteredError(ErrorLevel):
-    exc: str
+    e: BaseException
     code: str = "Z002"
 
     def message(self) -> str:
-        return f"Encountered an error:\n{self.exc}"
+        return f"Encountered an error:\n{self.e}"
 
 
 @dataclass
@@ -382,7 +382,7 @@ class SystemErrorRetrievingModTime(ErrorLevel):
 class SystemCouldNotWrite(DebugLevel):
     path: str
     reason: str
-    exc: str
+    exc: Exception
     code: str = "Z005"
 
     def message(self) -> str:
@@ -762,7 +762,7 @@ class DumpAfterRenameSchema(DebugLevel, Cache):
 
 @dataclass
 class AdapterImportError(InfoLevel):
-    exc: str
+    exc: Exception
     code: str = "E035"
 
     def message(self) -> str:
@@ -1008,7 +1008,7 @@ class PartialParsingNotEnabled(DebugLevel):
 @dataclass
 class ParsedFileLoadFailed(ShowException, DebugLevel):
     path: str
-    exc: str
+    exc: Exception
     code: str = "I029"
 
     def message(self) -> str:
@@ -1223,7 +1223,7 @@ class InvalidRefInTestNode(DebugLevel):
 
 @dataclass
 class RunningOperationCaughtError(ErrorLevel):
-    exc: str
+    exc: Exception
     code: str = "Q001"
 
     def message(self) -> str:
@@ -1232,7 +1232,7 @@ class RunningOperationCaughtError(ErrorLevel):
 
 @dataclass
 class RunningOperationUncaughtError(ErrorLevel):
-    exc: str
+    exc: Exception
     code: str = "FF01"
 
     def message(self) -> str:
@@ -1249,7 +1249,7 @@ class DbtProjectError(ErrorLevel):
 
 @dataclass
 class DbtProjectErrorException(ErrorLevel):
-    exc: str
+    exc: Exception
     code: str = "A010"
 
     def message(self) -> str:
@@ -1266,7 +1266,7 @@ class DbtProfileError(ErrorLevel):
 
 @dataclass
 class DbtProfileErrorException(ErrorLevel):
-    exc: str
+    exc: Exception
     code: str = "A012"
 
     def message(self) -> str:
@@ -1313,7 +1313,7 @@ https://docs.getdbt.com/docs/configure-your-profile
 
 @dataclass
 class CatchableExceptionOnRun(ShowException, DebugLevel):
-    exc: str
+    exc: Exception
     code: str = "W002"
 
     def message(self) -> str:
@@ -1323,7 +1323,7 @@ class CatchableExceptionOnRun(ShowException, DebugLevel):
 @dataclass
 class InternalExceptionOnRun(DebugLevel):
     build_path: str
-    exc: str
+    exc: Exception
     code: str = "W003"
 
     def message(self) -> str:
@@ -1352,7 +1352,7 @@ class PrintDebugStackTrace(ShowException, DebugLevel):
 class GenericExceptionOnRun(ErrorLevel):
     build_path: Optional[str]
     unique_id: str
-    exc: str
+    exc: Exception
     code: str = "W004"
 
     def message(self) -> str:
@@ -1366,7 +1366,7 @@ class GenericExceptionOnRun(ErrorLevel):
 @dataclass
 class NodeConnectionReleaseError(ShowException, DebugLevel):
     node_name: str
-    exc: str
+    exc: Exception
     code: str = "W005"
 
     def message(self) -> str:
@@ -1700,7 +1700,7 @@ class SQLCompiledPath(InfoLevel):
 
 @dataclass
 class SQlRunnerException(ShowException, DebugLevel):
-    exc: str
+    exc: Exception
     code: str = "Q006"
 
     def message(self) -> str:
@@ -2458,7 +2458,7 @@ class GeneralWarningMsg(WarnLevel):
 
 @dataclass
 class GeneralWarningException(WarnLevel):
-    exc: str
+    exc: Exception
     log_fmt: str
     code: str = "Z047"
 
@@ -2479,7 +2479,7 @@ class EventBufferFull(WarnLevel):
 
 @dataclass
 class RecordRetryException(DebugLevel):
-    exc: str
+    exc: Exception
     code: str = "M021"
 
     def message(self) -> str:
@@ -2495,7 +2495,7 @@ class RecordRetryException(DebugLevel):
 if 1 == 0:
     MainReportVersion(v="")
     MainKeyboardInterrupt()
-    MainEncounteredError(exc="")
+    MainEncounteredError(e=BaseException(""))
     MainStackTrace(stack_trace="")
     MainTrackingUserState(user_state="")
     ParsingStart()
@@ -2524,7 +2524,7 @@ if 1 == 0:
     RegistryResponseMissingNestedKeys(response=""),
     RegistryResponseExtraNestedKeys(response=""),
     SystemErrorRetrievingModTime(path="")
-    SystemCouldNotWrite(path="", reason="", exc="")
+    SystemCouldNotWrite(path="", reason="", exc=Exception(""))
     SystemExecutingCmd(cmd=[""])
     SystemStdOutMsg(bmsg=b"")
     SystemStdErrMsg(bmsg=b"")
@@ -2580,7 +2580,7 @@ if 1 == 0:
     DumpAfterAddGraph(Lazy.defer(lambda: dict()))
     DumpBeforeRenameSchema(Lazy.defer(lambda: dict()))
     DumpAfterRenameSchema(Lazy.defer(lambda: dict()))
-    AdapterImportError(exc="")
+    AdapterImportError(exc=Exception())
     PluginLoadError()
     SystemReportReturnCode(returncode=0)
     NewConnectionOpening(connection_state="")
@@ -2603,7 +2603,7 @@ if 1 == 0:
     PartialParsingFailedBecauseNewProjectDependency()
     PartialParsingFailedBecauseHashChanged()
     PartialParsingDeletedMetric(id="")
-    ParsedFileLoadFailed(path="", exc="")
+    ParsedFileLoadFailed(path="", exc=Exception(""))
     PartialParseSaveFileNotFound()
     StaticParserCausedJinjaRendering(path="")
     UsingExperimentalParser(path="")
@@ -2626,20 +2626,20 @@ if 1 == 0:
     PartialParsingDeletedExposure(unique_id="")
     InvalidDisabledSourceInTestNode(msg="")
     InvalidRefInTestNode(msg="")
-    RunningOperationCaughtError(exc="")
-    RunningOperationUncaughtError(exc="")
+    RunningOperationCaughtError(exc=Exception(""))
+    RunningOperationUncaughtError(exc=Exception(""))
     DbtProjectError()
-    DbtProjectErrorException(exc="")
+    DbtProjectErrorException(exc=Exception(""))
     DbtProfileError()
-    DbtProfileErrorException(exc="")
+    DbtProfileErrorException(exc=Exception(""))
     ProfileListTitle()
     ListSingleProfile(profile="")
     NoDefinedProfiles()
     ProfileHelpMessage()
-    CatchableExceptionOnRun(exc="")
-    InternalExceptionOnRun(build_path="", exc="")
-    GenericExceptionOnRun(build_path="", unique_id="", exc="")
-    NodeConnectionReleaseError(node_name="", exc="")
+    CatchableExceptionOnRun(exc=Exception(""))
+    InternalExceptionOnRun(build_path="", exc=Exception(""))
+    GenericExceptionOnRun(build_path="", unique_id="", exc=Exception(""))
+    NodeConnectionReleaseError(node_name="", exc=Exception(""))
     CheckCleanPath(path="")
     ConfirmCleanPath(path="")
     ProtectedCleanPath(path="")
@@ -2847,6 +2847,6 @@ if 1 == 0:
     TrackingInitializeFailure()
     RetryExternalCall(attempt=0, max=0)
     GeneralWarningMsg(msg="", log_fmt="")
-    GeneralWarningException(exc="", log_fmt="")
+    GeneralWarningException(exc=Exception(""), log_fmt="")
     EventBufferFull()
-    RecordRetryException(exc="")
+    RecordRetryException(exc=Exception(""))

core/dbt/exceptions.py

@@ -631,13 +631,13 @@ def ref_target_not_found(
     raise_compiler_error(msg, model)
 
 
-def get_not_found_or_disabled_msg(
-    node,
+def get_source_not_found_or_disabled_msg(
+    model,
     target_name: str,
-    target_kind: str,
-    target_package: Optional[str] = None,
+    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:
@@ -645,57 +645,34 @@ def get_not_found_or_disabled_msg(
     else:
         reason = "was not found"
     return _get_target_failure_msg(
-        node,
-        target_name,
-        target_package,
-        include_path=True,
-        reason=reason,
-        target_kind=target_kind,
+        model, full_name, None, include_path=True, reason=reason, target_kind="source"
     )
 
 
 def source_target_not_found(
     model, target_name: str, target_table_name: str, disabled: Optional[bool] = None
 ) -> NoReturn:
-    msg = get_not_found_or_disabled_msg(
-        node=model,
-        target_name=f"{target_name}.{target_table_name}",
-        target_kind="source",
-        disabled=disabled,
-    )
+    msg = get_source_not_found_or_disabled_msg(model, target_name, target_table_name, disabled)
     raise_compiler_error(msg, model)
 
 
-def metric_target_not_found(
-    metric, target_name: str, target_package: Optional[str], disabled: Optional[bool] = None
-) -> NoReturn:
-
-    msg = get_not_found_or_disabled_msg(
-        node=metric,
-        target_name=target_name,
-        target_kind="metric",
-        target_package=target_package,
-        disabled=disabled,
+def get_metric_not_found_msg(
+    model,
+    target_name: str,
+    target_package: Optional[str],
+) -> str:
+    reason = "was not found"
+    return _get_target_failure_msg(
+        model, target_name, target_package, include_path=True, reason=reason, target_kind="metric"
     )
 
+
+def metric_target_not_found(metric, target_name: str, target_package: Optional[str]) -> NoReturn:
+    msg = get_metric_not_found_msg(metric, target_name, target_package)
+
     raise_compiler_error(msg, metric)
 
 
-def exposure_target_not_found(
-    exposure, target_name: str, target_package: Optional[str], disabled: Optional[bool] = None
-) -> NoReturn:
-
-    msg = get_not_found_or_disabled_msg(
-        node=exposure,
-        target_name=target_name,
-        target_kind="exposure",
-        target_package=target_package,
-        disabled=disabled,
-    )
-
-    raise_compiler_error(msg, exposure)
-
-
 def dependency_not_found(model, target_model_name):
     raise_compiler_error(
         "'{}' depends on '{}' which is not in the graph!".format(
@@ -1098,7 +1075,7 @@ def warn_or_raise(exc, log_fmt=None):
     if flags.WARN_ERROR:
         raise exc
     else:
-        fire_event(GeneralWarningException(exc=str(exc), log_fmt=log_fmt))
+        fire_event(GeneralWarningException(exc=exc, log_fmt=log_fmt))
 
 
 def warn(msg, node=None):

core/dbt/flags.py

@@ -10,13 +10,7 @@ from typing import Optional
 # PROFILES_DIR must be set before the other flags
 # It also gets set in main.py and in set_from_args because the rpc server
 # doesn't go through exactly the same main arg processing.
-GLOBAL_PROFILES_DIR = os.path.join(os.path.expanduser("~"), ".dbt")
-LOCAL_PROFILES_DIR = os.getcwd()
-# Use the current working directory if there is a profiles.yml file present there
-if os.path.exists(Path(LOCAL_PROFILES_DIR) / Path("profiles.yml")):
-    DEFAULT_PROFILES_DIR = LOCAL_PROFILES_DIR
-else:
-    DEFAULT_PROFILES_DIR = GLOBAL_PROFILES_DIR
+DEFAULT_PROFILES_DIR = os.path.join(os.path.expanduser("~"), ".dbt")
 PROFILES_DIR = os.path.expanduser(os.getenv("DBT_PROFILES_DIR", DEFAULT_PROFILES_DIR))
 
 STRICT_MODE = False  # Only here for backwards compatibility
@@ -58,7 +52,6 @@ _NON_BOOLEAN_FLAGS = [
 
 _NON_DBT_ENV_FLAGS = ["DO_NOT_TRACK"]
 
-
 # Global CLI defaults. These flags are set from three places:
 # CLI args, environment variables, and user_config (profiles.yml).
 # Environment variables use the pattern 'DBT_{flag name}', like DBT_PROFILES_DIR

core/dbt/graph/selector.py

@@ -165,8 +165,7 @@ class NodeSelector(MethodManager):
         elif unique_id in self.manifest.exposures:
             return True
         elif unique_id in self.manifest.metrics:
-            metric = self.manifest.metrics[unique_id]
-            return metric.config.enabled
+            return True
         node = self.manifest.nodes[unique_id]
         return not node.empty and node.config.enabled
 

core/dbt/graph/selector_methods.py

@@ -356,21 +356,8 @@ class ConfigSelectorMethod(SelectorMethod):
             except AttributeError:
                 continue
             else:
-                if isinstance(value, list):
-                    if (
-                        (selector in value)
-                        or (CaseInsensitive(selector) == "true" and True in value)
-                        or (CaseInsensitive(selector) == "false" and False in value)
-                    ):
-                        yield node
-                else:
-                    if (
-                        (selector == value)
-                        or (CaseInsensitive(selector) == "true" and value is True)
-                        or (CaseInsensitive(selector) == "false")
-                        and value is False
-                    ):
-                        yield node
+                if selector == value:
+                    yield node
 
 
 class ResourceTypeSelectorMethod(SelectorMethod):

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

@@ -1,13 +1,3 @@
-{% macro current_timestamp() -%}
-  {{ adapter.dispatch('current_timestamp', 'dbt')() }}
-{%- endmacro %}
-
-{% macro default__current_timestamp() -%}
-  {{ exceptions.raise_not_implemented(
-    'current_timestamp macro not implemented for adapter '+adapter.type()) }}
-{%- endmacro %}
-
-
 {% macro collect_freshness(source, loaded_at_field, filter) %}
   {{ return(adapter.dispatch('collect_freshness', 'dbt')(source, loaded_at_field, filter))}}
 {% endmacro %}

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

@@ -12,7 +12,7 @@ The macro override naming method (spark__statement) only works for macros which
     {%- if language == 'sql'-%}
       {%- set res, table = adapter.execute(compiled_code, auto_begin=auto_begin, fetch=fetch_result) -%}
     {%- elif language == 'python' -%}
-      {%- set res = submit_python_job(model, compiled_code) -%}
+      {%- set res = adapter.submit_python_job(model, compiled_code) -%}
       {#-- TODO: What should table be for python models? --#}
       {%- set table = None -%}
     {%- else -%}

core/dbt/include/global_project/macros/materializations/models/incremental/column_helpers.sql

@@ -50,31 +50,3 @@
   {{ return(result) }}
 
 {% endmacro %}
-
-{% macro get_merge_update_columns(merge_update_columns, merge_exclude_columns, dest_columns) %}
-  {{ return(adapter.dispatch('get_merge_update_columns', 'dbt')(merge_update_columns, merge_exclude_columns, dest_columns)) }}
-{% endmacro %}
-
-{% macro default__get_merge_update_columns(merge_update_columns, merge_exclude_columns, dest_columns) %}
-  {%- set default_cols = dest_columns | map(attribute="quoted") | list -%}
-
-  {%- if merge_update_columns and merge_exclude_columns -%}
-    {{ exceptions.raise_compiler_error(
-        'Model cannot specify merge_update_columns and merge_exclude_columns. Please update model to use only one config'
-    )}}
-  {%- elif merge_update_columns -%}
-    {%- set update_columns = merge_update_columns -%}
-  {%- elif merge_exclude_columns -%}
-    {%- set update_columns = [] -%}
-    {%- for column in dest_columns -%}
-      {% if column.column | lower not in merge_exclude_columns | map("lower") | list %}
-        {%- do update_columns.append(column.quoted) -%}
-      {% endif %}
-    {%- endfor -%}
-  {%- else -%}
-    {%- set update_columns = default_cols -%}
-  {%- endif -%}
-
-  {{ return(update_columns) }}
-
-{% endmacro %}

core/dbt/include/global_project/macros/materializations/models/incremental/merge.sql

@@ -5,9 +5,7 @@
 {% macro default__get_merge_sql(target, source, unique_key, dest_columns, predicates) -%}
     {%- set predicates = [] if predicates is none else [] + predicates -%}
     {%- set dest_cols_csv = get_quoted_csv(dest_columns | map(attribute="name")) -%}
-    {%- set merge_update_columns = config.get('merge_update_columns') -%}
-    {%- set merge_exclude_columns = config.get('merge_exclude_columns') -%}
-    {%- set update_columns = get_merge_update_columns(merge_update_columns, merge_exclude_columns, dest_columns) -%}
+    {%- set update_columns = config.get('merge_update_columns', default = dest_columns | map(attribute="quoted") | list) -%}
     {%- set sql_header = config.get('sql_header', none) -%}
 
     {% if unique_key %}

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

@@ -30,8 +30,8 @@ def source(*args, dbt_load_df_function):
 
 {% macro build_config_dict(model) %}
     {%- set config_dict = {} -%}
-    {%- for key in model.config.config_keys_used -%}
-        {# weird type testing with enum, would be much easier to write this logic in Python! #}
+    {%- for key in model.config.utilized -%}
+        {# TODO: weird type testing with enum, would be much easier to write this logic in Python! #}
         {%- if key == 'language' -%}
           {%- set value = 'python' -%}
         {%- endif -%}
@@ -56,8 +56,8 @@ class config:
         pass
 
     @staticmethod
-    def get(key, default=None):
-        return config_dict.get(key, default)
+    def get(key):
+        return config_dict.get(key)
 
 class this:
     """dbt.this() or dbt.this.identifier"""

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

@@ -1,8 +0,0 @@
-{% macro array_append(array, new_element) -%}
-  {{ return(adapter.dispatch('array_append', 'dbt')(array, new_element)) }}
-{%- endmacro %}
-
-{# new_element must be the same data type as elements in array to match postgres functionality #}
-{% macro default__array_append(array, new_element) -%}
-    array_append({{ array }}, {{ new_element }})
-{%- endmacro %}

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

@@ -1,7 +0,0 @@
-{% macro array_concat(array_1, array_2) -%}
-  {{ return(adapter.dispatch('array_concat', 'dbt')(array_1, array_2)) }}
-{%- endmacro %}
-
-{% macro default__array_concat(array_1, array_2) -%}
-    array_cat({{ array_1 }}, {{ array_2 }})
-{%- endmacro %}

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

@@ -1,12 +0,0 @@
-{% macro array_construct(inputs=[], data_type=api.Column.translate_type('integer')) -%}
-  {{ return(adapter.dispatch('array_construct', 'dbt')(inputs, data_type)) }}
-{%- endmacro %}
-
-{# all inputs must be the same data type to match postgres functionality #}
-{% macro default__array_construct(inputs, data_type) -%}
-    {% if inputs|length > 0 %}
-    array[ {{ inputs|join(' , ') }} ]
-    {% else %}
-    array[]::{{data_type}}[]
-    {% endif %}
-{%- endmacro %}

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

@@ -59,7 +59,7 @@ The TIMESTAMP_* variation associated with TIMESTAMP is specified by the TIMESTAM
     {{ return(api.Column.translate_type("float")) }}
 {% endmacro %}
 
-{# numeric  -------------------------------------------------     #}
+{# numeric  ------------------------------------------------     #}
 
 {%- macro type_numeric() -%}
   {{ return(adapter.dispatch('type_numeric', 'dbt')()) }}
@@ -115,15 +115,3 @@ the precision and scale explicitly.)
 
 -- returns 'int' everywhere, except BigQuery, where it returns 'int64'
 -- (but BigQuery also now accepts 'int' as a valid alias for 'int64')
-
-{# bool  -------------------------------------------------     #}
-
-{%- macro type_boolean() -%}
-  {{ return(adapter.dispatch('type_boolean', 'dbt')()) }}
-{%- endmacro -%}
-
-{%- macro default__type_boolean() -%}
-  {{ return(api.Column.translate_type("boolean")) }}
-{%- endmacro -%}
-
--- returns 'boolean' everywhere. BigQuery accepts 'boolean' as a valid alias for 'bool'

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

@@ -0,0 +1,94 @@
+/* {#
+Future work:
+- Reconcile these with `date_function` and `snapshot_get_time`
+#} */
+
+---- CURRENT_TIMESTAMP ----
+
+{% macro current_timestamp() -%}
+  {{ adapter.dispatch('current_timestamp', 'dbt')() }}
+{%- endmacro %}
+
+{% macro default__current_timestamp() -%}
+  {{ exceptions.raise_not_implemented(
+    'current_timestamp macro not implemented for adapter '+adapter.type()) }}
+{%- endmacro %}
+
+
+---- CONVERT_TIMEZONE ----
+
+-- {# Borrowed from https://github.com/dbt-labs/snowplow/blob/main/macros/adapters/convert_timezone.sql #}
+{%- macro convert_timezone(in_tz, out_tz, in_timestamp) -%}
+    {{ adapter.dispatch('convert_timezone', 'dbt')(in_tz, out_tz, in_timestamp) }}
+{%- endmacro -%}
+
+{% macro default__convert_timezone(in_tz, out_tz, in_timestamp) %}
+    {% if in_tz is none %}
+        convert_timezone({{out_tz}}, {{in_timestamp}})
+    {% else %}
+        convert_timezone({{in_tz}}, {{out_tz}}, {{in_timestamp}})
+    {% endif %}
+{% endmacro %}
+
+-- move to dbt-postgres
+{% macro postgres__convert_timezone(in_tz, out_tz, in_timestamp) %}
+    {% if in_tz is none %}
+        ({{in_timestamp}} at time zone {{out_tz}})::timestamptz
+        convert_timezone({{out_tz}}, {{in_timestamp}})
+    {% else %}
+        ({{in_timestamp}} at time zone {{in_tz}} at time zone {{out_tz}})::timestamptz
+    {% endif %}
+{% endmacro %}
+
+-- {# redshift should use default instead of postgres #}
+-- TODO move to dbt-redshift
+{% macro redshift__convert_timezone() %}
+    {{ return(dbt.default__convert_timezone()) }}
+{% endmacro %}
+
+
+---- CURRENT_TIMESTAMP_IN_UTC ----
+
+
+{% macro current_timestamp_in_utc() -%}
+    {{ return(adapter.dispatch('current_timestamp_in_utc', 'dbt')()) }}
+{%- endmacro %}
+
+{% macro default__current_timestamp_in_utc() %}
+    {{ return(
+        convert_timezone(
+            in_tz = none,
+            out_tz = 'UTC',
+            in_timestamp = current_timestamp()
+      )) }}
+{% endmacro %}
+
+---------------------------------------------
+
+/* {#
+    DEPRECATED: DO NOT USE IN NEW PROJECTS
+    
+    This is ONLY to handle the fact that Snowflake + Postgres had functionally
+    different implementations of {{ dbt.current_timestamp }} + {{ dbt_utils.current_timestamp }}
+    
+    If you had a project or package that called {{ dbt_utils.current_timestamp() }}, you should
+    continue to use this macro to guarantee identical behavior on those two databases.
+#} */
+
+{% macro current_timestamp_backcompat() %}
+    {{ return(adapter.dispatch('current_timestamp_backcompat', 'dbt')()) }}
+{% endmacro %}
+
+{% macro default__current_timestamp_backcompat() %}
+    {{ return(adapter.dispatch('current_timestamp', 'dbt')()) }}
+{% endmacro %}
+
+-- TODO move to dbt-postgres
+{% macro postgres__current_timestamp_backcompat() %}
+    current_timestamp::{{ type_timestamp() }}
+{% endmacro %}
+
+-- TODO move to dbt-snowflake
+{% macro snowflake__current_timestamp_backcompat() %}
+    current_timestamp::{{ type_timestamp() }}
+{% endmacro %}

core/dbt/lib.py

@@ -1,64 +1,10 @@
+# TODO: this file is one big TODO
 import os
-from dbt.contracts.results import RunningStatus, collect_timing_info
-from dbt.events.functions import fire_event
-from dbt.events.types import NodeCompiling, NodeExecuting
 from dbt.exceptions import RuntimeException
 from dbt import flags
-from dbt.task.sql import SqlCompileRunner
-from dataclasses import dataclass
+from collections import namedtuple
 
-
-@dataclass
-class RuntimeArgs:
-    project_dir: str
-    profiles_dir: str
-    single_threaded: bool
-    profile: str
-    target: str
-
-
-class SqlCompileRunnerNoIntrospection(SqlCompileRunner):
-    def compile_and_execute(self, manifest, ctx):
-        """
-        This version of this method does not connect to the data warehouse.
-        As a result, introspective queries at compilation will not be supported
-        and will throw an error.
-
-        TODO: This is a temporary solution to more complex permissions requirements
-        for the semantic layer, and thus largely duplicates the code in the parent class
-        method. Once conditional credential usage is enabled, this should be removed.
-        """
-        result = None
-        ctx.node._event_status["node_status"] = RunningStatus.Compiling
-        fire_event(
-            NodeCompiling(
-                node_info=ctx.node.node_info,
-                unique_id=ctx.node.unique_id,
-            )
-        )
-        with collect_timing_info("compile") as timing_info:
-            # if we fail here, we still have a compiled node to return
-            # this has the benefit of showing a build path for the errant
-            # model
-            ctx.node = self.compile(manifest)
-        ctx.timing.append(timing_info)
-
-        # for ephemeral nodes, we only want to compile, not run
-        if not ctx.node.is_ephemeral_model:
-            ctx.node._event_status["node_status"] = RunningStatus.Executing
-            fire_event(
-                NodeExecuting(
-                    node_info=ctx.node.node_info,
-                    unique_id=ctx.node.unique_id,
-                )
-            )
-            with collect_timing_info("execute") as timing_info:
-                result = self.run(ctx.node, manifest)
-                ctx.node = result.node
-
-            ctx.timing.append(timing_info)
-
-        return result
+RuntimeArgs = namedtuple("RuntimeArgs", "project_dir profiles_dir single_threaded profile target")
 
 
 def get_dbt_config(project_dir, args=None, single_threaded=False):
@@ -69,32 +15,29 @@ def get_dbt_config(project_dir, args=None, single_threaded=False):
     if os.getenv("DBT_PROFILES_DIR"):
         profiles_dir = os.getenv("DBT_PROFILES_DIR")
     else:
-        profiles_dir = flags.DEFAULT_PROFILES_DIR
+        profiles_dir = os.path.expanduser("~/.dbt")
 
-    runtime_args = RuntimeArgs(
-        project_dir=project_dir,
-        profiles_dir=profiles_dir,
-        single_threaded=single_threaded,
-        profile=getattr(args, "profile", None),
-        target=getattr(args, "target", None),
+    profile = args.profile if hasattr(args, "profile") else None
+    target = args.target if hasattr(args, "target") else None
+
+    # Construct a phony config
+    config = RuntimeConfig.from_args(
+        RuntimeArgs(project_dir, profiles_dir, single_threaded, profile, target)
     )
-
-    # Construct a RuntimeConfig from phony args
-    config = RuntimeConfig.from_args(runtime_args)
-
-    # Set global flags from arguments
+    # Clear previously registered adapters--
+    # this fixes cacheing behavior on the dbt-server
     flags.set_from_args(args, config)
-
-    # This is idempotent, so we can call it repeatedly
+    dbt.adapters.factory.reset_adapters()
+    # Load the relevant adapter
     dbt.adapters.factory.register_adapter(config)
-
-    # Make sure we have a valid invocation_id
+    # Set invocation id
     dbt.events.functions.set_invocation_id()
 
     return config
 
 
 def get_task_by_type(type):
+    # TODO: we need to tell dbt-server what tasks are available
     from dbt.task.run import RunTask
     from dbt.task.list import ListTask
     from dbt.task.seed import SeedTask
@@ -127,13 +70,16 @@ def create_task(type, args, manifest, config):
     def no_op(*args, **kwargs):
         pass
 
+    # TODO: yuck, let's rethink tasks a little
     task = task(args, config)
+
+    # Wow! We can monkeypatch taskCls.load_manifest to return _our_ manifest
     task.load_manifest = no_op
     task.manifest = manifest
     return task
 
 
-def _get_operation_node(manifest, project_path, sql, node_name):
+def _get_operation_node(manifest, project_path, sql):
     from dbt.parser.manifest import process_node
     from dbt.parser.sql import SqlBlockParser
     import dbt.adapters.factory
@@ -146,33 +92,26 @@ def _get_operation_node(manifest, project_path, sql, node_name):
     )
 
     adapter = dbt.adapters.factory.get_adapter(config)
-    sql_node = block_parser.parse_remote(sql, node_name)
+    # TODO : This needs a real name?
+    sql_node = block_parser.parse_remote(sql, "name")
     process_node(config, manifest, sql_node)
     return config, sql_node, adapter
 
 
-def compile_sql(manifest, project_path, sql, node_name="query"):
-    config, node, adapter = _get_operation_node(manifest, project_path, sql, node_name)
-    allow_introspection = str(os.environ.get("__DBT_ALLOW_INTROSPECTION", "1")).lower() in (
-        "true",
-        "1",
-        "on",
-    )
+def compile_sql(manifest, project_path, sql):
+    from dbt.task.sql import SqlCompileRunner
 
-    if allow_introspection:
-        runner = SqlCompileRunner(config, adapter, node, 1, 1)
-    else:
-        runner = SqlCompileRunnerNoIntrospection(config, adapter, node, 1, 1)
+    config, node, adapter = _get_operation_node(manifest, project_path, sql)
+    runner = SqlCompileRunner(config, adapter, node, 1, 1)
     return runner.safe_run(manifest)
 
 
-def execute_sql(manifest, project_path, sql, node_name="query"):
+def execute_sql(manifest, project_path, sql):
     from dbt.task.sql import SqlExecuteRunner
 
-    config, node, adapter = _get_operation_node(manifest, project_path, sql, node_name)
-
+    config, node, adapter = _get_operation_node(manifest, project_path, sql)
     runner = SqlExecuteRunner(config, adapter, node, 1, 1)
-
+    # TODO: use same interface for runner
     return runner.safe_run(manifest)
 
 
@@ -189,4 +128,5 @@ def deserialize_manifest(manifest_msgpack):
 
 
 def serialize_manifest(manifest):
+    # TODO: what should this take as an arg?
     return manifest.to_msgpack()

core/dbt/main.py

@@ -1,5 +1,4 @@
 from typing import List
-
 from dbt.logger import log_cache_events, log_manager
 
 import argparse
@@ -43,13 +42,8 @@ from dbt.adapters.factory import reset_adapters, cleanup_connections
 import dbt.tracking
 
 from dbt.utils import ExitCodes, args_to_dict
-from dbt.config.profile import read_user_config
-from dbt.exceptions import (
-    Exception as dbtException,
-    InternalException,
-    NotImplementedException,
-    FailedToConnectException,
-)
+from dbt.config.profile import DEFAULT_PROFILES_DIR, read_user_config
+from dbt.exceptions import InternalException, NotImplementedException, FailedToConnectException
 
 
 class DBTVersion(argparse.Action):
@@ -148,9 +142,8 @@ def main(args=None):
             exit_code = e.code
 
         except BaseException as e:
-            fire_event(MainEncounteredError(exc=str(e)))
-            if not isinstance(e, dbtException):
-                fire_event(MainStackTrace(stack_trace=traceback.format_exc()))
+            fire_event(MainEncounteredError(e=str(e)))
+            fire_event(MainStackTrace(stack_trace=traceback.format_exc()))
             exit_code = ExitCodes.UnhandledError.value
 
     sys.exit(exit_code)
@@ -208,7 +201,7 @@ def track_run(task):
         yield
         dbt.tracking.track_invocation_end(config=task.config, args=task.args, result_type="ok")
     except (NotImplementedException, FailedToConnectException) as e:
-        fire_event(MainEncounteredError(exc=str(e)))
+        fire_event(MainEncounteredError(e=str(e)))
         dbt.tracking.track_invocation_end(config=task.config, args=task.args, result_type="error")
     except Exception:
         dbt.tracking.track_invocation_end(config=task.config, args=task.args, result_type="error")
@@ -265,8 +258,10 @@ def _build_base_subparser():
         dest="sub_profiles_dir",  # Main cli arg precedes subcommand
         type=str,
         help="""
-        Which directory to look in for the profiles.yml file. If not set, dbt will look in the current working directory first, then HOME/.dbt/
-        """,
+        Which directory to look in for the profiles.yml file. Default = {}
+        """.format(
+            DEFAULT_PROFILES_DIR
+        ),
     )
 
     base_subparser.add_argument(
@@ -625,7 +620,6 @@ def _add_table_mutability_arguments(*subparsers):
     for sub in subparsers:
         sub.add_argument(
             "--full-refresh",
-            "-f",
             action="store_true",
             help="""
             If specified, dbt will drop incremental models and
@@ -1065,8 +1059,10 @@ def parse_args(args, cls=DBTArgumentParser):
         dest="profiles_dir",
         type=str,
         help="""
-        Which directory to look in for the profiles.yml file. If not set, dbt will look in the current working directory first, then HOME/.dbt/
-        """,
+        Which directory to look in for the profiles.yml file. Default = {}
+        """.format(
+            DEFAULT_PROFILES_DIR
+        ),
     )
 
     p.add_argument(

core/dbt/parser/base.py

@@ -233,7 +233,7 @@ class ConfiguredParser(
 
     def render_with_context(self, parsed_node: IntermediateNode, config: ContextConfig):
         # Given the parsed node and a ContextConfig to use during parsing,
-        # render the node's sql with macro capture enabled.
+        # render the node's sql wtih macro capture enabled.
         # Note: this mutates the config object when config calls are rendered.
         context = self._context_for(parsed_node, config)
 

core/dbt/parser/macros.py

@@ -20,7 +20,9 @@ class MacroParser(BaseParser[ParsedMacro]):
     # from the normal parsing flow.
     def get_paths(self) -> List[FilePath]:
         return filesystem_search(
-            project=self.project, relative_dirs=self.project.macro_paths, extension=".sql"
+            project=self.project,
+            relative_dirs=self.project.macro_paths,
+            extension=".sql",
         )
 
     @property

core/dbt/parser/manifest.py

@@ -74,8 +74,7 @@ from dbt.exceptions import (
     get_target_not_found_or_disabled_msg,
     source_target_not_found,
     metric_target_not_found,
-    exposure_target_not_found,
-    get_not_found_or_disabled_msg,
+    get_source_not_found_or_disabled_msg,
     warn_or_error,
 )
 from dbt.parser.base import Parser
@@ -351,7 +350,7 @@ class ManifestLoader:
                     project, project_parser_files[project.project_name], parser_types
                 )
 
-            # Now that we've loaded most of the nodes (except for schema tests, sources, metrics)
+            # Now that we've loaded most of the nodes (except for schema tests and sources)
             # load up the Lookup objects to resolve them by name, so the SourceFiles store
             # the unique_id instead of the name. Sources are loaded from yaml files, so
             # aren't in place yet
@@ -378,14 +377,13 @@ class ManifestLoader:
             patcher.construct_sources()
             self.manifest.sources = patcher.sources
             self._perf_info.patch_sources_elapsed = time.perf_counter() - start_patch
-
             # We need to rebuild disabled in order to include disabled sources
             self.manifest.rebuild_disabled_lookup()
 
             # copy the selectors from the root_project to the manifest
             self.manifest.selectors = self.root_project.manifest_selectors
 
-            # update the refs, sources, docs and metrics depends_on.nodes
+            # update the refs, sources, and docs
             # These check the created_at time on the nodes to
             # determine whether they need processing.
             start_process = time.perf_counter()
@@ -660,7 +658,7 @@ class ManifestLoader:
                     manifest.metadata.invocation_id = get_invocation_id()
                     return manifest
             except Exception as exc:
-                fire_event(ParsedFileLoadFailed(path=path, exc=str(exc)))
+                fire_event(ParsedFileLoadFailed(path=path, exc=exc))
                 reparse_reason = ReparseReason.load_file_failure
         else:
             fire_event(PartialParseSaveFileNotFound())
@@ -948,12 +946,7 @@ def invalid_ref_fail_unless_test(node, target_model_name, target_model_package,
 
 def invalid_source_fail_unless_test(node, target_name, target_table_name, disabled):
     if node.resource_type == NodeType.Test:
-        msg = get_not_found_or_disabled_msg(
-            node=node,
-            target_name=f"{target_name}.{target_table_name}",
-            target_kind="source",
-            disabled=disabled,
-        )
+        msg = get_source_not_found_or_disabled_msg(node, target_name, target_table_name, disabled)
         if disabled:
             fire_event(InvalidDisabledSourceInTestNode(msg=msg))
         else:
@@ -975,21 +968,6 @@ def invalid_metric_fail_unless_test(node, target_metric_name, target_metric_pack
         )
 
 
-def invalid_exposure_fail_unless_test(node, target_exposure_name, target_exposure_package):
-
-    if node.resource_type == NodeType.Test:
-        msg = get_target_not_found_or_disabled_msg(
-            node, target_exposure_name, target_exposure_package
-        )
-        warn_or_error(msg, log_fmt=warning_tag("{}"))
-    else:
-        exposure_target_not_found(
-            node,
-            target_exposure_name,
-            target_exposure_package,
-        )
-
-
 def _check_resource_uniqueness(
     manifest: Manifest,
     config: RuntimeConfig,
@@ -1124,7 +1102,6 @@ def _process_refs_for_exposure(manifest: Manifest, current_project: str, exposur
         if target_model is None or isinstance(target_model, Disabled):
             # This may raise. Even if it doesn't, we don't want to add
             # this exposure to the graph b/c there is no destination exposure
-            exposure.config.enabled = False
             invalid_ref_fail_unless_test(
                 exposure,
                 target_model_name,
@@ -1165,8 +1142,7 @@ def _process_refs_for_metric(manifest: Manifest, current_project: str, metric: P
 
         if target_model is None or isinstance(target_model, Disabled):
             # This may raise. Even if it doesn't, we don't want to add
-            # this metric to the graph b/c there is no destination metric
-            metric.config.enabled = False
+            # this exposure to the graph b/c there is no destination exposure
             invalid_ref_fail_unless_test(
                 metric,
                 target_model_name,
@@ -1187,7 +1163,7 @@ def _process_metrics_for_node(
 ):
     """Given a manifest and a node in that manifest, process its metrics"""
     for metric in node.metrics:
-        target_metric: Optional[Union[Disabled, ParsedMetric]] = None
+        target_metric: Optional[ParsedMetric] = None
         target_metric_name: str
         target_metric_package: Optional[str] = None
 
@@ -1200,6 +1176,7 @@ def _process_metrics_for_node(
                 f"Metric references should always be 1 or 2 arguments - got {len(metric)}"
             )
 
+        # Resolve_ref
         target_metric = manifest.resolve_metric(
             target_metric_name,
             target_metric_package,
@@ -1207,10 +1184,9 @@ def _process_metrics_for_node(
             node.package_name,
         )
 
-        if target_metric is None or isinstance(target_metric, Disabled):
+        if target_metric is None:
             # This may raise. Even if it doesn't, we don't want to add
             # this node to the graph b/c there is no destination node
-            node.config.enabled = False
             invalid_metric_fail_unless_test(
                 node,
                 target_metric_name,
@@ -1282,7 +1258,6 @@ def _process_sources_for_exposure(
             exposure.package_name,
         )
         if target_source is None or isinstance(target_source, Disabled):
-            exposure.config.enabled = False
             invalid_source_fail_unless_test(
                 exposure, source_name, table_name, disabled=(isinstance(target_source, Disabled))
             )
@@ -1302,7 +1277,6 @@ def _process_sources_for_metric(manifest: Manifest, current_project: str, metric
             metric.package_name,
         )
         if target_source is None or isinstance(target_source, Disabled):
-            metric.config.enabled = False
             invalid_source_fail_unless_test(
                 metric, source_name, table_name, disabled=(isinstance(target_source, Disabled))
             )

core/dbt/parser/models.py

@@ -60,8 +60,8 @@ class PythonValidationVisitor(ast.NodeVisitor):
                 )
 
     def check_error(self, node):
-        if self.num_model_def > 1:
-            raise ParsingException("dbt only allows one model defined per python file", node=node)
+        if self.num_model_def != 1:
+            raise ParsingException("dbt only allow one model defined per python file", node=node)
         if len(self.dbt_errors) != 0:
             raise ParsingException("\n".join(self.dbt_errors), node=node)
 
@@ -86,12 +86,11 @@ class PythonParseVisitor(ast.NodeVisitor):
     def _safe_eval(self, node):
         try:
             return ast.literal_eval(node)
-        except (SyntaxError, ValueError, TypeError, MemoryError, RecursionError) as exc:
-            msg = validator_error_message(
-                f"Error when trying to literal_eval an arg to dbt.ref(), dbt.source(), dbt.config() or dbt.config.get() \n{exc}\n"
-                "https://docs.python.org/3/library/ast.html#ast.literal_eval\n"
-                "In dbt python model, `dbt.ref`, `dbt.source`, `dbt.config`, `dbt.config.get` function args only support Python literal structures"
-            )
+        except (SyntaxError, ValueError, TypeError) as exc:
+            msg = validator_error_message(exc)
+            raise ParsingException(msg, node=self.dbt_node) from exc
+        except (MemoryError, RecursionError) as exc:
+            msg = validator_error_message(exc)
             raise ParsingException(msg, node=self.dbt_node) from exc
 
     def _get_call_literals(self, node):
@@ -113,7 +112,7 @@ class PythonParseVisitor(ast.NodeVisitor):
         return arg_literals, kwarg_literals
 
     def visit_Call(self, node: ast.Call) -> None:
-        # check whether the current call could be a dbt function call
+        # check weather the current call could be a dbt function call
         if isinstance(node.func, ast.Attribute) and node.func.attr in dbt_function_key_words:
             func_name = self._flatten_attr(node.func)
             # check weather the current call really is a dbt function call
@@ -204,25 +203,18 @@ class ModelParser(SimpleSQLParser[ParsedModelNode]):
         dbtValidator.visit(tree)
         dbtValidator.check_error(node)
 
-        # if the user didn't specify an explicit `model(dbt, session)` function,
-        # we're going to treat the user code as a "script" to be wrapped in that function at compile time.
-        # for now, we just need to recognize that fact, and save it to the node.
-        if dbtValidator.num_model_def == 0:
-            # TODO: this is silly, put this somewhere better (outside of user space)
-            node.meta["missing_model_function"] = True
-
         dbtParser = PythonParseVisitor(node)
         dbtParser.visit(tree)
-        config_keys_used = []
+
         for (func, args, kwargs) in dbtParser.dbt_function_calls:
+            # TODO decide what we want to do with detected packages
+            # if func == "config":
+            #     kwargs["detected_packages"] = dbtParser.packages
             if func == "get":
-                config_keys_used.append(args[0])
+                context["config"](utilized=args)
                 continue
 
             context[func](*args, **kwargs)
-        if config_keys_used:
-            # this is being used in macro build_config_dict
-            context["config"](config_keys_used=config_keys_used)
 
     def render_update(self, node: ParsedModelNode, config: ContextConfig) -> None:
         self.manifest._parsing_info.static_analysis_path_count += 1

core/dbt/parser/partial.py

@@ -245,22 +245,6 @@ class PartialParsing:
                 if "overrides" in source:
                     self.remove_source_override_target(source)
 
-    def delete_disabled(self, unique_id, file_id):
-        # This node/metric/exposure is disabled. Find it and remove it from disabled dictionary.
-        for dis_index, dis_node in enumerate(self.saved_manifest.disabled[unique_id]):
-            if dis_node.file_id == file_id:
-                node = dis_node
-                index = dis_index
-                break
-        # Remove node from disabled
-        del self.saved_manifest.disabled[unique_id][index]
-        # if all nodes were removed for the unique id, delete the unique_id
-        # from the disabled dict
-        if not self.saved_manifest.disabled[unique_id]:
-            self.saved_manifest.disabled.pop(unique_id)
-
-        return node
-
     # Deletes for all non-schema files
     def delete_from_saved(self, file_id):
         # Look at all things touched by file, remove those
@@ -335,7 +319,15 @@ class PartialParsing:
             and unique_id in self.saved_manifest.disabled
         ):
             # This node is disabled. Find the node and remove it from disabled dictionary.
-            node = self.delete_disabled(unique_id, source_file.file_id)
+            for dis_index, dis_node in enumerate(self.saved_manifest.disabled[unique_id]):
+                if dis_node.file_id == source_file.file_id:
+                    node = dis_node
+                    break
+            if dis_node:
+                # Remove node from disabled and unique_id from disabled dict if necessary
+                del self.saved_manifest.disabled[unique_id][dis_index]
+                if not self.saved_manifest.disabled[unique_id]:
+                    self.saved_manifest.disabled.pop(unique_id)
         else:
             # Has already been deleted by another action
             return
@@ -893,40 +885,34 @@ class PartialParsing:
                 self.add_to_pp_files(self.saved_files[macro_file_id])
 
     # exposures are created only from schema files, so just delete
-    # the exposure or the disabled exposure.
+    # the exposure.
     def delete_schema_exposure(self, schema_file, exposure_dict):
         exposure_name = exposure_dict["name"]
         exposures = schema_file.exposures.copy()
         for unique_id in exposures:
+            exposure = self.saved_manifest.exposures[unique_id]
             if unique_id in self.saved_manifest.exposures:
-                exposure = self.saved_manifest.exposures[unique_id]
                 if exposure.name == exposure_name:
                     self.deleted_manifest.exposures[unique_id] = self.saved_manifest.exposures.pop(
                         unique_id
                     )
                     schema_file.exposures.remove(unique_id)
                     fire_event(PartialParsingDeletedExposure(unique_id=unique_id))
-            elif unique_id in self.saved_manifest.disabled:
-                self.delete_disabled(unique_id, schema_file.file_id)
 
-    # metrics are created only from schema files, but also can be referred to by other nodes
+    # metric are created only from schema files, so just delete
+    # the metric.
     def delete_schema_metric(self, schema_file, metric_dict):
         metric_name = metric_dict["name"]
         metrics = schema_file.metrics.copy()
         for unique_id in metrics:
+            metric = self.saved_manifest.metrics[unique_id]
             if unique_id in self.saved_manifest.metrics:
-                metric = self.saved_manifest.metrics[unique_id]
                 if metric.name == metric_name:
-                    # Need to find everything that referenced this metric and schedule for parsing
-                    if unique_id in self.saved_manifest.child_map:
-                        self.schedule_nodes_for_parsing(self.saved_manifest.child_map[unique_id])
                     self.deleted_manifest.metrics[unique_id] = self.saved_manifest.metrics.pop(
                         unique_id
                     )
                     schema_file.metrics.remove(unique_id)
                     fire_event(PartialParsingDeletedMetric(id=unique_id))
-            elif unique_id in self.saved_manifest.disabled:
-                self.delete_disabled(unique_id, schema_file.file_id)
 
     def get_schema_element(self, elem_list, elem_name):
         for element in elem_list:

core/dbt/parser/read_files.py

@@ -1,5 +1,3 @@
-import os
-import pathspec  # type: ignore
 import pathlib
 from dbt.clients.system import load_file_contents
 from dbt.contracts.files import (
@@ -109,9 +107,9 @@ def load_seed_source_file(match: FilePath, project_name) -> SourceFile:
 
 # Use the FilesystemSearcher to get a bunch of FilePaths, then turn
 # them into a bunch of FileSource objects
-def get_source_files(project, paths, extension, parse_file_type, saved_files, ignore_spec):
+def get_source_files(project, paths, extension, parse_file_type, saved_files):
     # file path list
-    fp_list = filesystem_search(project, paths, extension, ignore_spec)
+    fp_list = filesystem_search(project, paths, extension)
     # file block list
     fb_list = []
     for fp in fp_list:
@@ -131,84 +129,42 @@ def get_source_files(project, paths, extension, parse_file_type, saved_files, ig
     return fb_list
 
 
-def read_files_for_parser(project, files, dirs, extensions, parse_ft, saved_files, ignore_spec):
+def read_files_for_parser(project, files, dirs, extensions, parse_ft, saved_files):
     parser_files = []
     for extension in extensions:
-        source_files = get_source_files(
-            project, dirs, extension, parse_ft, saved_files, ignore_spec
-        )
+        source_files = get_source_files(project, dirs, extension, parse_ft, saved_files)
         for sf in source_files:
             files[sf.file_id] = sf
             parser_files.append(sf.file_id)
     return parser_files
 
 
-def generate_dbt_ignore_spec(project_root):
-    ignore_file_path = os.path.join(project_root, ".dbtignore")
-
-    ignore_spec = None
-    if os.path.exists(ignore_file_path):
-        with open(ignore_file_path) as f:
-            ignore_spec = pathspec.PathSpec.from_lines(pathspec.patterns.GitWildMatchPattern, f)
-    return ignore_spec
-
-
 # This needs to read files for multiple projects, so the 'files'
 # dictionary needs to be passed in. What determines the order of
 # the various projects? Is the root project always last? Do the
 # non-root projects need to be done separately in order?
 def read_files(project, files, parser_files, saved_files):
-    dbt_ignore_spec = generate_dbt_ignore_spec(project.project_root)
+
     project_files = {}
 
     project_files["MacroParser"] = read_files_for_parser(
-        project,
-        files,
-        project.macro_paths,
-        [".sql"],
-        ParseFileType.Macro,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.macro_paths, [".sql"], ParseFileType.Macro, saved_files
     )
 
     project_files["ModelParser"] = read_files_for_parser(
-        project,
-        files,
-        project.model_paths,
-        [".sql", ".py"],
-        ParseFileType.Model,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.model_paths, [".sql", ".py"], ParseFileType.Model, saved_files
     )
 
     project_files["SnapshotParser"] = read_files_for_parser(
-        project,
-        files,
-        project.snapshot_paths,
-        [".sql"],
-        ParseFileType.Snapshot,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.snapshot_paths, [".sql"], ParseFileType.Snapshot, saved_files
     )
 
     project_files["AnalysisParser"] = read_files_for_parser(
-        project,
-        files,
-        project.analysis_paths,
-        [".sql"],
-        ParseFileType.Analysis,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.analysis_paths, [".sql"], ParseFileType.Analysis, saved_files
     )
 
     project_files["SingularTestParser"] = read_files_for_parser(
-        project,
-        files,
-        project.test_paths,
-        [".sql"],
-        ParseFileType.SingularTest,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.test_paths, [".sql"], ParseFileType.SingularTest, saved_files
     )
 
     # all generic tests within /tests must be nested under a /generic subfolder
@@ -219,27 +175,14 @@ def read_files(project, files, parser_files, saved_files):
         [".sql"],
         ParseFileType.GenericTest,
         saved_files,
-        dbt_ignore_spec,
     )
 
     project_files["SeedParser"] = read_files_for_parser(
-        project,
-        files,
-        project.seed_paths,
-        [".csv"],
-        ParseFileType.Seed,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.seed_paths, [".csv"], ParseFileType.Seed, saved_files
     )
 
     project_files["DocumentationParser"] = read_files_for_parser(
-        project,
-        files,
-        project.docs_paths,
-        [".md"],
-        ParseFileType.Documentation,
-        saved_files,
-        dbt_ignore_spec,
+        project, files, project.docs_paths, [".md"], ParseFileType.Documentation, saved_files
     )
 
     project_files["SchemaParser"] = read_files_for_parser(
@@ -249,7 +192,6 @@ def read_files(project, files, parser_files, saved_files):
         [".yml", ".yaml"],
         ParseFileType.Schema,
         saved_files,
-        dbt_ignore_spec,
     )
 
     # Store the parser files for this particular project

core/dbt/parser/schema_renderer.py

@@ -67,8 +67,7 @@ class SchemaYamlRenderer(BaseRenderer):
             elif self._is_norender_key(keypath[0:]):
                 return False
         elif self.key == "metrics":
-            # back compat: "expression" is new name, "sql" is old name
-            if keypath[0] in ("expression", "sql"):
+            if keypath[0] == "expression":
                 return False
             elif self._is_norender_key(keypath[0:]):
                 return False

core/dbt/parser/schemas.py

@@ -14,9 +14,6 @@ from dbt.clients.yaml_helper import load_yaml_text
 from dbt.parser.schema_renderer import SchemaYamlRenderer
 from dbt.context.context_config import (
     ContextConfig,
-    BaseContextConfigGenerator,
-    ContextConfigGenerator,
-    UnrenderedConfigGenerator,
 )
 from dbt.context.configured import generate_schema_yml_context, SchemaYamlVars
 from dbt.context.providers import (
@@ -26,7 +23,6 @@ from dbt.context.providers import (
 )
 from dbt.context.macro_resolver import MacroResolver
 from dbt.contracts.files import FileHash, SchemaSourceFile
-from dbt.contracts.graph.model_config import MetricConfig, ExposureConfig
 from dbt.contracts.graph.parsed import (
     ParsedNodePatch,
     ColumnInfo,
@@ -78,6 +74,13 @@ from dbt.ui import warning_tag
 from dbt.utils import get_pseudo_test_path, coerce_dict_str
 
 
+UnparsedSchemaYaml = Union[
+    UnparsedSourceDefinition,
+    UnparsedNodeUpdate,
+    UnparsedAnalysisUpdate,
+    UnparsedMacroUpdate,
+]
+
 TestDef = Union[str, Dict[str, Any]]
 
 schema_file_keys = (
@@ -88,7 +91,6 @@ schema_file_keys = (
     "macros",
     "analyses",
     "exposures",
-    "metrics",
 )
 
 
@@ -544,12 +546,14 @@ class SchemaParser(SimpleParser[GenericTestBlock, ParsedGenericTestNode]):
             # parse exposures
             if "exposures" in dct:
                 exp_parser = ExposureParser(self, yaml_block)
-                exp_parser.parse()
+                for exposure_node in exp_parser.parse():
+                    self.manifest.add_exposure(yaml_block.file, exposure_node)
 
             # parse metrics
             if "metrics" in dct:
                 metric_parser = MetricParser(self, yaml_block)
-                metric_parser.parse()
+                for metric_node in metric_parser.parse():
+                    self.manifest.add_metric(yaml_block.file, metric_node)
 
 
 def check_format_version(file_path, yaml_dct) -> None:
@@ -970,7 +974,7 @@ class ExposureParser(YamlReader):
         self.schema_parser = schema_parser
         self.yaml = yaml
 
-    def parse_exposure(self, unparsed: UnparsedExposure):
+    def parse_exposure(self, unparsed: UnparsedExposure) -> ParsedExposure:
         package_name = self.project.project_name
         unique_id = f"{NodeType.Exposure}.{package_name}.{unparsed.name}"
         path = self.yaml.path.relative_path
@@ -978,25 +982,6 @@ class ExposureParser(YamlReader):
         fqn = self.schema_parser.get_fqn_prefix(path)
         fqn.append(unparsed.name)
 
-        config = self._generate_exposure_config(
-            target=unparsed,
-            fqn=fqn,
-            package_name=package_name,
-            rendered=True,
-        )
-
-        unrendered_config = self._generate_exposure_config(
-            target=unparsed,
-            fqn=fqn,
-            package_name=package_name,
-            rendered=False,
-        )
-
-        if not isinstance(config, ExposureConfig):
-            raise InternalException(
-                f"Calculated a {type(config)} for an exposure, but expected an ExposureConfig"
-            )
-
         parsed = ParsedExposure(
             package_name=package_name,
             root_path=self.project.project_root,
@@ -1010,11 +995,8 @@ class ExposureParser(YamlReader):
             meta=unparsed.meta,
             tags=unparsed.tags,
             description=unparsed.description,
-            label=unparsed.label,
             owner=unparsed.owner,
             maturity=unparsed.maturity,
-            config=config,
-            unrendered_config=unrendered_config,
         )
         ctx = generate_parse_exposure(
             parsed,
@@ -1025,36 +1007,9 @@ class ExposureParser(YamlReader):
         depends_on_jinja = "\n".join("{{ " + line + "}}" for line in unparsed.depends_on)
         get_rendered(depends_on_jinja, ctx, parsed, capture_macros=True)
         # parsed now has a populated refs/sources
+        return parsed
 
-        if parsed.config.enabled:
-            self.manifest.add_exposure(self.yaml.file, parsed)
-        else:
-            self.manifest.add_disabled(self.yaml.file, parsed)
-
-    def _generate_exposure_config(
-        self, target: UnparsedExposure, fqn: List[str], package_name: str, rendered: bool
-    ):
-        generator: BaseContextConfigGenerator
-        if rendered:
-            generator = ContextConfigGenerator(self.root_project)
-        else:
-            generator = UnrenderedConfigGenerator(self.root_project)
-
-        # configs with precendence set
-        precedence_configs = dict()
-        # apply exposure configs
-        precedence_configs.update(target.config)
-
-        return generator.calculate_node_config(
-            config_call_dict={},
-            fqn=fqn,
-            resource_type=NodeType.Exposure,
-            project_name=package_name,
-            base=False,
-            patch_config_dict=precedence_configs,
-        )
-
-    def parse(self):
+    def parse(self) -> Iterable[ParsedExposure]:
         for data in self.get_key_dicts():
             try:
                 UnparsedExposure.validate(data)
@@ -1062,8 +1017,8 @@ class ExposureParser(YamlReader):
             except (ValidationError, JSONValidationException) as exc:
                 msg = error_context(self.yaml.path, self.key, data, exc)
                 raise ParsingException(msg) from exc
-
-            self.parse_exposure(unparsed)
+            parsed = self.parse_exposure(unparsed)
+            yield parsed
 
 
 class MetricParser(YamlReader):
@@ -1072,7 +1027,7 @@ class MetricParser(YamlReader):
         self.schema_parser = schema_parser
         self.yaml = yaml
 
-    def parse_metric(self, unparsed: UnparsedMetric):
+    def parse_metric(self, unparsed: UnparsedMetric) -> ParsedMetric:
         package_name = self.project.project_name
         unique_id = f"{NodeType.Metric}.{package_name}.{unparsed.name}"
         path = self.yaml.path.relative_path
@@ -1080,25 +1035,6 @@ class MetricParser(YamlReader):
         fqn = self.schema_parser.get_fqn_prefix(path)
         fqn.append(unparsed.name)
 
-        config = self._generate_metric_config(
-            target=unparsed,
-            fqn=fqn,
-            package_name=package_name,
-            rendered=True,
-        )
-
-        unrendered_config = self._generate_metric_config(
-            target=unparsed,
-            fqn=fqn,
-            package_name=package_name,
-            rendered=False,
-        )
-
-        if not isinstance(config, MetricConfig):
-            raise InternalException(
-                f"Calculated a {type(config)} for a metric, but expected a MetricConfig"
-            )
-
         parsed = ParsedMetric(
             package_name=package_name,
             root_path=self.project.project_root,
@@ -1119,8 +1055,6 @@ class MetricParser(YamlReader):
             filters=unparsed.filters,
             meta=unparsed.meta,
             tags=unparsed.tags,
-            config=config,
-            unrendered_config=unrendered_config,
         )
 
         ctx = generate_parse_metrics(
@@ -1140,42 +1074,14 @@ class MetricParser(YamlReader):
             node=parsed,
         )
 
-        # if the metric is disabled we do not want it included in the manifest, only in the disabled dict
-        if parsed.config.enabled:
-            self.manifest.add_metric(self.yaml.file, parsed)
-        else:
-            self.manifest.add_disabled(self.yaml.file, parsed)
+        return parsed
 
-    def _generate_metric_config(
-        self, target: UnparsedMetric, fqn: List[str], package_name: str, rendered: bool
-    ):
-        generator: BaseContextConfigGenerator
-        if rendered:
-            generator = ContextConfigGenerator(self.root_project)
-        else:
-            generator = UnrenderedConfigGenerator(self.root_project)
-
-        # configs with precendence set
-        precedence_configs = dict()
-        # first apply metric configs
-        precedence_configs.update(target.config)
-
-        return generator.calculate_node_config(
-            config_call_dict={},
-            fqn=fqn,
-            resource_type=NodeType.Metric,
-            project_name=package_name,
-            base=False,
-            patch_config_dict=precedence_configs,
-        )
-
-    def parse(self):
+    def parse(self) -> Iterable[ParsedMetric]:
         for data in self.get_key_dicts():
             try:
                 UnparsedMetric.validate(data)
                 unparsed = UnparsedMetric.from_dict(data)
-
             except (ValidationError, JSONValidationException) as exc:
                 msg = error_context(self.yaml.path, self.key, data, exc)
                 raise ParsingException(msg) from exc
-            self.parse_metric(unparsed)
+            yield self.parse_metric(unparsed)

core/dbt/parser/search.py

@@ -1,7 +1,6 @@
 import os
 from dataclasses import dataclass
-from typing import List, Callable, Iterable, Set, Union, Iterator, TypeVar, Generic, Optional
-from pathspec import PathSpec  # type: ignore
+from typing import List, Callable, Iterable, Set, Union, Iterator, TypeVar, Generic
 
 from dbt.clients.jinja import extract_toplevel_blocks, BlockTag
 from dbt.clients.system import find_matching
@@ -62,16 +61,11 @@ class FullBlock(FileBlock):
         return self.block.full_block
 
 
-def filesystem_search(
-    project: Project,
-    relative_dirs: List[str],
-    extension: str,
-    ignore_spec: Optional[PathSpec] = None,
-):
+def filesystem_search(project: Project, relative_dirs: List[str], extension: str):
     ext = "[!.#~]*" + extension
     root = project.project_root
     file_path_list = []
-    for result in find_matching(root, relative_dirs, ext, ignore_spec):
+    for result in find_matching(root, relative_dirs, ext):
         if "searched_path" not in result or "relative_path" not in result:
             raise InternalException("Invalid result from find_matching: {}".format(result))
         file_match = FilePath(

core/dbt/parser/sources.py

@@ -63,7 +63,7 @@ class SourcePatcher:
                 self.sources[unpatched.unique_id] = unpatched
                 continue
             # returns None if there is no patch
-            patch = self.get_patch_for(unpatched)
+            patch = self.get_patch_for(unpatched)  # type: ignore[unreachable] # CT-564 / GH 5169
 
             # returns unpatched if there is no patch
             patched = self.patch_source(unpatched, patch)
@@ -213,8 +213,8 @@ class SourcePatcher:
         self,
         unpatched: UnpatchedSourceDefinition,
     ) -> Optional[SourcePatch]:
-        if isinstance(unpatched, ParsedSourceDefinition):
-            return None
+        if isinstance(unpatched, ParsedSourceDefinition):  # type: ignore[unreachable] # CT-564 / GH 5169
+            return None  # type: ignore[unreachable] # CT-564 / GH 5169
         key = (unpatched.package_name, unpatched.source.name)
         patch: Optional[SourcePatch] = self.manifest.source_patches.get(key)
         if patch is None:

core/dbt/parser/sql.py

@@ -43,7 +43,7 @@ class SqlBlockParser(SimpleSQLParser[ParsedSqlNode]):
         return os.path.join("sql", block.name)
 
     def parse_remote(self, sql: str, name: str) -> ParsedSqlNode:
-        source_file = SourceFile.remote(sql, self.project.project_name, "sql")
+        source_file = SourceFile.remote(sql, self.project.project_name)
         contents = SqlBlock(block_name=name, file=source_file)
         return self.parse_node(contents)
 

core/dbt/task/base.py

@@ -108,13 +108,13 @@ class BaseTask(metaclass=ABCMeta):
             config = cls.ConfigType.from_args(args)
         except dbt.exceptions.DbtProjectError as exc:
             fire_event(DbtProjectError())
-            fire_event(DbtProjectErrorException(exc=str(exc)))
+            fire_event(DbtProjectErrorException(exc=exc))
 
             tracking.track_invalid_invocation(args=args, result_type=exc.result_type)
             raise dbt.exceptions.RuntimeException("Could not run dbt") from exc
         except dbt.exceptions.DbtProfileError as exc:
             fire_event(DbtProfileError())
-            fire_event(DbtProfileErrorException(exc=str(exc)))
+            fire_event(DbtProfileErrorException(exc=exc))
 
             all_profiles = read_profiles(flags.PROFILES_DIR).keys()
 
@@ -170,7 +170,6 @@ def get_nearest_project_dir(args):
 def move_to_nearest_project_dir(args):
     nearest_project_dir = get_nearest_project_dir(args)
     os.chdir(nearest_project_dir)
-    return nearest_project_dir
 
 
 class ConfiguredTask(BaseTask):
@@ -346,11 +345,11 @@ class BaseRunner(metaclass=ABCMeta):
         if e.node is None:
             e.add_node(ctx.node)
 
-        fire_event(CatchableExceptionOnRun(exc=str(e)))
+        fire_event(CatchableExceptionOnRun(exc=e))
         return str(e)
 
     def _handle_internal_exception(self, e, ctx):
-        fire_event(InternalExceptionOnRun(build_path=self.node.build_path, exc=str(e)))
+        fire_event(InternalExceptionOnRun(build_path=self.node.build_path, exc=e))
         return str(e)
 
     def _handle_generic_exception(self, e, ctx):
@@ -358,7 +357,7 @@ class BaseRunner(metaclass=ABCMeta):
             GenericExceptionOnRun(
                 build_path=self.node.build_path,
                 unique_id=self.node.unique_id,
-                exc=str(e),
+                exc=str(e),  # TODO: unstring this when serialization is fixed
             )
         )
         fire_event(PrintDebugStackTrace())
@@ -414,7 +413,7 @@ class BaseRunner(metaclass=ABCMeta):
         try:
             self.adapter.release_connection()
         except Exception as exc:
-            fire_event(NodeConnectionReleaseError(node_name=self.node.name, exc=str(exc)))
+            fire_event(NodeConnectionReleaseError(node_name=self.node.name, exc=exc))
             return str(exc)
 
         return None

core/dbt/task/debug.py

@@ -21,6 +21,10 @@ from dbt.version import get_installed_version
 
 from dbt.task.base import BaseTask, get_nearest_project_dir
 
+PROFILE_DIR_MESSAGE = """To view your profiles.yml file, run:
+
+{open_cmd} {profiles_dir}"""
+
 ONLY_PROFILE_MESSAGE = """
 A `dbt_project.yml` file was not found in this directory.
 Using the only profile `{}`.

core/dbt/task/run.py

@@ -278,9 +278,7 @@ class ModelRunner(CompileRunner):
 
         hook_ctx = self.adapter.pre_model_hook(context_config)
         try:
-            result = MacroGenerator(
-                materialization_macro, context, stack=context["context_macro_stack"]
-            )()
+            result = MacroGenerator(materialization_macro, context)()
         finally:
             self.adapter.post_model_hook(context_config, hook_ctx)
 

core/dbt/task/run_operation.py

@@ -55,11 +55,11 @@ class RunOperationTask(ManifestTask):
         try:
             self._run_unsafe()
         except dbt.exceptions.Exception as exc:
-            fire_event(RunningOperationCaughtError(exc=str(exc)))
+            fire_event(RunningOperationCaughtError(exc=exc))
             fire_event(PrintDebugStackTrace())
             success = False
         except Exception as exc:
-            fire_event(RunningOperationUncaughtError(exc=str(exc)))
+            fire_event(RunningOperationUncaughtError(exc=exc))
             fire_event(PrintDebugStackTrace())
             success = False
         else:

core/dbt/task/sql.py

@@ -22,7 +22,7 @@ class GenericSqlRunner(CompileRunner, Generic[SQLResult]):
         CompileRunner.__init__(self, config, adapter, node, node_index, num_nodes)
 
     def handle_exception(self, e, ctx):
-        fire_event(SQlRunnerException(exc=str(e)))
+        fire_event(SQlRunnerException(exc=e))
         if isinstance(e, dbt.exceptions.Exception):
             if isinstance(e, dbt.exceptions.RuntimeException):
                 e.add_node(ctx.node)

core/dbt/tests/util.py

@@ -6,7 +6,6 @@ import warnings
 from datetime import datetime
 from typing import List
 from contextlib import contextmanager
-from dbt.adapters.factory import Adapter
 
 from dbt.main import handle_and_check
 from dbt.logger import log_manager
@@ -216,7 +215,6 @@ class TestProcessingException(Exception):
 def run_sql_with_adapter(adapter, sql, fetch=None):
     if sql.strip() == "":
         return
-
     # substitute schema and database in sql
     kwargs = {
         "schema": adapter.config.credentials.schema,
@@ -310,7 +308,7 @@ def check_relation_types(adapter, relation_to_type):
 # by doing a separate call for each set of tables/relations.
 # Wraps check_relations_equal_with_relations by creating relations
 # from the list of names passed in.
-def check_relations_equal(adapter, relation_names: List, compare_snapshot_cols=False):
+def check_relations_equal(adapter, relation_names, compare_snapshot_cols=False):
     if len(relation_names) < 2:
         raise TestProcessingException(
             "Not enough relations to compare",
@@ -327,9 +325,7 @@ def check_relations_equal(adapter, relation_names: List, compare_snapshot_cols=F
 #    adapter.get_columns_in_relation
 #    adapter.get_rows_different_sql
 #    adapter.execute
-def check_relations_equal_with_relations(
-    adapter: Adapter, relations: List, compare_snapshot_cols=False
-):
+def check_relations_equal_with_relations(adapter, relations, compare_snapshot_cols=False):
 
     with get_connection(adapter):
         basis, compares = relations[0], relations[1:]
@@ -338,12 +334,12 @@ def check_relations_equal_with_relations(
         # (unless comparing "dbt_" snapshot columns is explicitly enabled)
         column_names = [
             c.name
-            for c in adapter.get_columns_in_relation(basis)  # type: ignore
+            for c in adapter.get_columns_in_relation(basis)
             if not c.name.lower().startswith("dbt_") or compare_snapshot_cols
         ]
 
         for relation in compares:
-            sql = adapter.get_rows_different_sql(basis, relation, column_names=column_names)  # type: ignore
+            sql = adapter.get_rows_different_sql(basis, relation, column_names=column_names)
             _, tbl = adapter.execute(sql, fetch=True)
             num_rows = len(tbl)
             assert (