CT-2461: Fix merge issues

core/dbt/contracts/graph/manifest.py

@@ -982,7 +982,6 @@ def resolve_refs(
 
         return resolved_refs
 
-    # TODO: Simplify this function by passing the ref (target) instead of the ref's properties
     # Called by dbt.parser.manifest._process_refs_for_exposure, _process_refs_for_metric,
     # and dbt.parser.manifest._process_refs_for_node
     def resolve_ref(

core/dbt/parser/base.py

@@ -193,7 +193,7 @@ def _create_parsetime_node(
             language = ModelLanguage.python
             config.add_config_call({"materialized": "table"})
         else:
-            # this is not ideal, but we have a lot of tests to adjust if don't do it
+            # this is not ideal but we have a lot of tests to adjust if don't do it
             language = ModelLanguage.sql
 
         dct = {
@@ -212,7 +212,6 @@ def _create_parsetime_node(
             "config": self.config_dict(config),
             "checksum": block.file.checksum.to_dict(omit_none=True),
         }
-
         dct.update(kwargs)
         try:
             return self.parse_from_dict(dct, validate=True)

core/dbt/parser/schemas.py

@@ -516,8 +516,9 @@ def parse_patch(self, block: TargetBlock[NodeTarget], refs: ParserRef) -> None:
         # We're not passing the ParsedNodePatch around anymore, so we
         # could possibly skip creating one. Leaving here for now for
         # code consistency.
+        deprecation_date: Optional[datetime.datetime] = None
         if isinstance(block.target, UnparsedModelUpdate):
-            deprecation_date: Optional[datetime.datetime] = block.target.deprecation_date
+            deprecation_date = block.target.deprecation_date
 
         patch = ParsedNodePatch(
             name=block.target.name,
@@ -788,6 +789,7 @@ def patch_node_properties(self, node, patch: "ParsedNodePatch"):
         super().patch_node_properties(node, patch)
         node.version = patch.version
         node.latest_version = patch.latest_version
+        node.deprecation_date = patch.deprecation_date
         if patch.access:
             if AccessType.is_valid(patch.access):
                 node.access = AccessType(patch.access)