ct-2198: Unify constraints and check_constraints fields

core/dbt/contracts/graph/unparsed.py

@@ -88,7 +88,7 @@ class Docs(dbtClassMixin, Replaceable):
 
 
 @dataclass
-class HasDocs(AdditionalPropertiesMixin, ExtensibleDbtClassMixin, Replaceable):
+class HasColumnProps(AdditionalPropertiesMixin, ExtensibleDbtClassMixin, Replaceable):
  name: str
  description: str = ""
  meta: Dict[str, Any] = field(default_factory=dict)
@@ -104,7 +104,7 @@ class HasDocs(AdditionalPropertiesMixin, ExtensibleDbtClassMixin, Replaceable):
 
 
 @dataclass
-class HasTests(HasDocs):
+class HasColumnAndTestProps(HasColumnProps):
  tests: Optional[List[TestDef]] = None
 
  def __post_init__(self):
@@ -113,18 +113,18 @@ def __post_init__(self):
 
 
 @dataclass
-class UnparsedColumn(HasTests):
+class UnparsedColumn(HasColumnAndTestProps):
  quote: Optional[bool] = None
  tags: List[str] = field(default_factory=list)
 
 
 @dataclass
 class HasColumnDocs(dbtClassMixin, Replaceable):
- columns: Sequence[HasDocs] = field(default_factory=list)
+ columns: Sequence[HasColumnProps] = field(default_factory=list)
 
 
 @dataclass
-class HasColumnTests(HasColumnDocs):
+class HasColumnTests(dbtClassMixin, Replaceable):
  columns: Sequence[UnparsedColumn] = field(default_factory=list)
 
 
@@ -145,12 +145,12 @@ class HasConfig:
 
 
 @dataclass
-class UnparsedAnalysisUpdate(HasConfig, HasColumnDocs, HasDocs, HasYamlMetadata):
+class UnparsedAnalysisUpdate(HasConfig, HasColumnDocs, HasColumnProps, HasYamlMetadata):
  pass
 
 
 @dataclass
-class UnparsedNodeUpdate(HasConfig, HasColumnTests, HasTests, HasYamlMetadata):
+class UnparsedNodeUpdate(HasConfig, HasColumnTests, HasColumnAndTestProps, HasYamlMetadata):
  quote_columns: Optional[bool] = None
 
 
@@ -162,7 +162,7 @@ class MacroArgument(dbtClassMixin):
 
 
 @dataclass
-class UnparsedMacroUpdate(HasConfig, HasDocs, HasYamlMetadata):
+class UnparsedMacroUpdate(HasConfig, HasColumnProps, HasYamlMetadata):
  arguments: List[MacroArgument] = field(default_factory=list)
 
 
@@ -249,7 +249,7 @@ class Quoting(dbtClassMixin, Mergeable):
 
 
 @dataclass
-class UnparsedSourceTableDefinition(HasColumnTests, HasTests):
+class UnparsedSourceTableDefinition(HasColumnTests, HasColumnAndTestProps):
  config: Dict[str, Any] = field(default_factory=dict)
  loaded_at_field: Optional[str] = None
  identifier: Optional[str] = None

core/dbt/parser/schemas.py

@@ -41,7 +41,7 @@
 from dbt.contracts.graph.unparsed import (
  HasColumnDocs,
  HasColumnTests,
- HasDocs,
+ HasColumnProps,
  SourcePatch,
  UnparsedAnalysisUpdate,
  UnparsedColumn,
@@ -117,15 +117,7 @@ class ParserRef:
  def __init__(self):
  self.column_info: Dict[str, ColumnInfo] = {}
 
- def add(
- self,
- column: Union[HasDocs, UnparsedColumn],
- description: str,
- data_type: Optional[str],
- constraints: Optional[List[str]],
- constraints_check: Optional[str],
- meta: Dict[str, Any],
- ):
+ def _add(self, column: HasColumnProps):
  tags: List[str] = []
  tags.extend(getattr(column, "tags", ()))
  quote: Optional[bool]
@@ -135,11 +127,11 @@ def add(
  quote = None
  self.column_info[column.name] = ColumnInfo(
  name=column.name,
- description=description,
- data_type=data_type,
- constraints=constraints,
- constraints_check=constraints_check,
- meta=meta,
+ description=column.description,
+ data_type=column.data_type,
+ constraints=column.constraints,
+ constraints_check=column.constraints_check,
+ meta=column.meta,
  tags=tags,
  quote=quote,
  _extra=column.extra,
@@ -149,12 +141,7 @@ def add(
  def from_target(cls, target: Union[HasColumnDocs, HasColumnTests]) -> "ParserRef":
  refs = cls()
  for column in target.columns:
- description = column.description
- data_type = column.data_type
- constraints = column.constraints
- constraints_check = column.constraints_check
- meta = column.meta
- refs.add(column, description, data_type, constraints, constraints_check, meta)
+ refs._add(column)
  return refs