Include the database when deciding if two tables are the same (#1708)

core/dbt/contracts/graph/compiled.py

@@ -1,8 +1,6 @@
 from dbt.contracts.graph.parsed import (
     ParsedNode,
     ParsedAnalysisNode,
-    ParsedDocumentation,
-    ParsedMacro,
     ParsedModelNode,
     ParsedHookNode,
     ParsedRPCNode,
@@ -216,8 +214,6 @@ def parsed_instance_for(compiled: CompiledNode) -> ParsedNode:
     CompiledSnapshotNode,
     CompiledTestNode,
     ParsedAnalysisNode,
-    ParsedDocumentation,
-    ParsedMacro,
     ParsedModelNode,
     ParsedHookNode,
     ParsedRPCNode,

core/dbt/contracts/graph/manifest.py

@@ -367,38 +367,6 @@ def get_resource_fqns(self):
 
         return resource_fqns
 
-    def _filter_subgraph(self, subgraph, predicate):
-        """
-        Given a subgraph of the manifest, and a predicate, filter
-        the subgraph using that predicate. Generates a list of nodes.
-        """
-        to_return = []
-
-        for unique_id, item in subgraph.items():
-            if predicate(item):
-                to_return.append(item)
-
-        return to_return
-
-    def _model_matches_schema_and_table(self, schema, table, model):
-        if model.resource_type == NodeType.Source:
-            return (model.schema.lower() == schema.lower() and
-                    model.identifier.lower() == table.lower())
-        return (model.schema.lower() == schema.lower() and
-                model.alias.lower() == table.lower())
-
-    def get_unique_ids_for_schema_and_table(self, schema, table):
-        """
-        Given a schema and table, find matching models, and return
-        their unique_ids. A schema and table may have more than one
-        match if the relation matches both a source and a seed, for instance.
-        """
-        def predicate(model):
-            return self._model_matches_schema_and_table(schema, table, model)
-
-        matching = list(self._filter_subgraph(self.nodes, predicate))
-        return [match.unique_id for match in matching]
-
     def add_nodes(self, new_nodes):
         """Add the given dict of new nodes to the manifest."""
         for unique_id, node in new_nodes.items():

core/dbt/contracts/graph/parsed.py

@@ -219,6 +219,10 @@ class ParsedNodeMandatory(
 ):
     alias: str
 
+    @property
+    def identifier(self):
+        return self.alias
+
 
 @dataclass
 class ParsedNodeDefaults(ParsedNodeMandatory):

core/dbt/helper_types.py

@@ -1,11 +1,11 @@
 # never name this package "types", or mypy will crash in ugly ways
+from datetime import timedelta
+from typing import NewType
+
 from hologram import (
     FieldEncoder, JsonSchemaMixin, JsonDict, ValidationError
 )
 
-from datetime import timedelta
-from typing import NewType
-
 
 Port = NewType('Port', int)
 
@@ -39,5 +39,5 @@ def json_schema(self) -> JsonDict:
 
 JsonSchemaMixin.register_field_encoders({
     Port: PortEncoder(),
-    timedelta: TimeDeltaFieldEncoder()
+    timedelta: TimeDeltaFieldEncoder(),
 })