Merge pull request #2312 from fishtown-analytics/feature/dbt-project-v2

dbt project v2

core/dbt/adapters/base/__init__.py

@@ -10,5 +10,5 @@
     SchemaSearchMap,
 )
 from dbt.adapters.base.column import Column  # noqa
-from dbt.adapters.base.impl import BaseAdapter  # noqa
+from dbt.adapters.base.impl import AdapterConfig, BaseAdapter  # noqa
 from dbt.adapters.base.plugin import AdapterPlugin  # noqa

core/dbt/adapters/base/impl.py

@@ -1,10 +1,11 @@
 import abc
 from concurrent.futures import as_completed, Future
 from contextlib import contextmanager
+from dataclasses import dataclass
 from datetime import datetime
 from typing import (
-    Optional, Tuple, Callable, Iterable, FrozenSet, Type, Dict, Any, List,
-    Mapping, Iterator, Union, Set
+    Optional, Tuple, Callable, Iterable, Type, Dict, Any, List, Mapping,
+    Iterator, Union, Set
 )
 
 import agate
@@ -23,6 +24,7 @@
 from dbt.contracts.graph.compiled import CompileResultNode, CompiledSeedNode
 from dbt.contracts.graph.manifest import Manifest
 from dbt.contracts.graph.parsed import ParsedSeedNode
+from dbt.contracts.graph.model_config import BaseConfig
 from dbt.exceptions import warn_or_error
 from dbt.node_types import NodeType
 from dbt.logger import GLOBAL_LOGGER as logger
@@ -105,6 +107,11 @@ def _relation_name(rel: Optional[BaseRelation]) -> str:
         return str(rel)
 
 
+@dataclass
+class AdapterConfig(BaseConfig):
+    pass
+
+
 class BaseAdapter(metaclass=AdapterMeta):
     """The BaseAdapter provides an abstract base class for adapters.
 
@@ -147,7 +154,7 @@ class BaseAdapter(metaclass=AdapterMeta):
 
     # A set of clobber config fields accepted by this adapter
     # for use in materializations
-    AdapterSpecificConfigs: FrozenSet[str] = frozenset()
+    AdapterSpecificConfigs: Type[AdapterConfig] = AdapterConfig
 
     def __init__(self, config):
         self.config = config

core/dbt/adapters/factory.py

@@ -7,7 +7,7 @@
 from dbt.logger import GLOBAL_LOGGER as logger
 from dbt.contracts.connection import Credentials, AdapterRequiredConfig
 
-from dbt.adapters.base.impl import BaseAdapter
+from dbt.adapters.base.impl import BaseAdapter, AdapterConfig
 from dbt.adapters.base.plugin import AdapterPlugin
 
 
@@ -40,6 +40,12 @@ def get_relation_class_by_name(self, name: str) -> Type[BaseRelation]:
         adapter = self.get_adapter_class_by_name(name)
         return adapter.Relation
 
+    def get_config_class_by_name(
+        self, name: str
+    ) -> Type[AdapterConfig]:
+        adapter = self.get_adapter_class_by_name(name)
+        return adapter.AdapterSpecificConfigs
+
     def load_plugin(self, name: str) -> Type[Credentials]:
         # this doesn't need a lock: in the worst case we'll overwrite PACKAGES
         # and adapter_type entries with the same value, as they're all
@@ -137,6 +143,10 @@ def get_adapter_class_by_name(name: str) -> Type[BaseAdapter]:
     return FACTORY.get_adapter_class_by_name(name)
 
 
+def get_config_class_by_name(name: str) -> Type[AdapterConfig]:
+    return FACTORY.get_config_class_by_name(name)
+
+
 def get_relation_class_by_name(name: str) -> Type[BaseRelation]:
     return FACTORY.get_relation_class_by_name(name)
 

core/dbt/compilation.py

@@ -12,7 +12,6 @@
 
 from dbt.context.providers import generate_runtime_model
 from dbt.contracts.graph.manifest import Manifest
-import dbt.contracts.project
 import dbt.exceptions
 import dbt.flags
 import dbt.config

core/dbt/config/__init__.py

@@ -2,4 +2,3 @@
 from .profile import Profile, PROFILES_DIR, read_user_config  # noqa
 from .project import Project  # noqa
 from .runtime import RuntimeConfig, UnsetProfileConfig  # noqa
-from .renderer import ConfigRenderer  # noqa

core/dbt/config/profile.py

@@ -16,7 +16,7 @@
 from dbt.logger import GLOBAL_LOGGER as logger
 from dbt.utils import coerce_dict_str
 
-from .renderer import ConfigRenderer
+from .renderer import ProfileRenderer
 
 DEFAULT_THREADS = 1
 DEFAULT_PROFILES_DIR = os.path.join(os.path.expanduser('~'), '.dbt')
@@ -240,7 +240,7 @@ def render_profile(
         raw_profile: Dict[str, Any],
         profile_name: str,
         target_override: Optional[str],
-        renderer: ConfigRenderer,
+        renderer: ProfileRenderer,
     ) -> Tuple[str, Dict[str, Any]]:
         """This is a containment zone for the hateful way we're rendering
         profiles.
@@ -268,15 +268,15 @@ def render_profile(
             raw_profile, profile_name, target_name
         )
 
-        profile_data = renderer.render_profile_data(raw_profile_data)
+        profile_data = renderer.render_data(raw_profile_data)
         return target_name, profile_data
 
     @classmethod
     def from_raw_profile_info(
         cls,
         raw_profile: Dict[str, Any],
         profile_name: str,
-        renderer: ConfigRenderer,
+        renderer: ProfileRenderer,
         user_cfg: Optional[Dict[str, Any]] = None,
         target_override: Optional[str] = None,
         threads_override: Optional[int] = None,
@@ -330,7 +330,7 @@ def from_raw_profiles(
         cls,
         raw_profiles: Dict[str, Any],
         profile_name: str,
-        renderer: ConfigRenderer,
+        renderer: ProfileRenderer,
         target_override: Optional[str] = None,
         threads_override: Optional[int] = None,
     ) -> 'Profile':
@@ -380,7 +380,7 @@ def from_raw_profiles(
     def render_from_args(
         cls,
         args: Any,
-        renderer: ConfigRenderer,
+        renderer: ProfileRenderer,
         project_profile_name: Optional[str],
     ) -> 'Profile':
         """Given the raw profiles as read from disk and the name of the desired