Skip to content
Merged
Prev Previous commit
Next Next commit
Changes for some code review comments
  • Loading branch information
gshank committed Aug 25, 2023
commit dde27b6a038612e257faadba1026addb7d311689
14 changes: 2 additions & 12 deletions core/dbt/dataclass_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,8 @@ def json_schema(cls):
json_schema = json_schema_obj.to_dict()
return json_schema

@classmethod
def clean_dictionary_keys_for_validate(cls, data):
return data

@classmethod
def validate(cls, data):
data = cls.clean_dictionary_keys_for_validate(data)
json_schema = cls.json_schema()
validator = jsonschema.Draft7Validator(json_schema)
error = next(iter(validator.iter_errors(data)), None)
Expand Down Expand Up @@ -114,20 +109,15 @@ def _get_fields(cls) -> List[Tuple[Field, str]]:
# the field's metadata "alias". Since this method is mainly
# just used in merging config dicts, it mostly applies to
# pre-hook and post-hook.
field_alias = f.metadata.get("alias")
field_name = field_alias or f.name
field_name = f.metadata.get("alias", f.name)
mapped_fields.append((f, field_name))
cls._mapped_fields[cls.__name__] = mapped_fields
return cls._mapped_fields[cls.__name__]

# copied from hologram. Used in tests
@classmethod
def _get_field_names(cls):
fields = cls._get_fields()
field_names = []
for element in fields:
field_names.append(element[1])
return field_names
return [element[1] for element in cls._get_fields()]


class ValidatedStringMixin(str, SerializableType):
Expand Down
8 changes: 3 additions & 5 deletions tests/unit/test_graph.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .utils import config_from_parts_or_dicts, generate_name_macros, inject_plugin
import os

from argparse import Namespace
import unittest
from unittest.mock import MagicMock, patch

Expand All @@ -19,16 +19,14 @@
from dbt.contracts.graph.manifest import MacroManifest, ManifestStateCheck
from dbt.graph import NodeSelector, parse_difference
from dbt.events.functions import setup_event_logger
from dbt.flags import set_from_args
from argparse import Namespace

set_from_args(Namespace(WARN_ERROR=False), None)

try:
from queue import Empty
except ImportError:
from Queue import Empty

from .utils import config_from_parts_or_dicts, generate_name_macros, inject_plugin


class GraphTest(unittest.TestCase):
def tearDown(self):
Expand Down
3 changes: 0 additions & 3 deletions tests/unit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@ def assert_from_dict(obj, dct, cls=None):
obj_from_dict.created_at = 1
obj.created_at = 1

if obj_from_dict != obj:
print(f"--- obj_from_dict: {obj_from_dict}")
print(f"--- obj: {obj}")
assert obj_from_dict == obj


Expand Down