Merge pull request #652 from hivedspace/DATA-491

get prod alias from manifest file when provided

Author: dlawin

data_diff/dbt.py

@@ -166,22 +166,22 @@ def _get_diff_vars(
     cli_columns = list(columns_flag) if columns_flag else []
     dev_database = model.database
     dev_schema = model.schema_
-
+    dev_alias = prod_alias = model.alias
     primary_keys = dbt_parser.get_pk_from_model(model, dbt_parser.unique_columns, "primary-key")
 
     # prod path is constructed via configuration or the prod manifest via --state
     if dbt_parser.prod_manifest_obj:
-        prod_database, prod_schema = _get_prod_path_from_manifest(model, dbt_parser.prod_manifest_obj)
+        prod_database, prod_schema, prod_alias = _get_prod_path_from_manifest(model, dbt_parser.prod_manifest_obj)
     else:
         prod_database, prod_schema = _get_prod_path_from_config(config, model, dev_database, dev_schema)
 
     if dbt_parser.requires_upper:
-        dev_qualified_list = [x.upper() for x in [dev_database, dev_schema, model.alias] if x]
-        prod_qualified_list = [x.upper() for x in [prod_database, prod_schema, model.alias] if x]
+        dev_qualified_list = [x.upper() for x in [dev_database, dev_schema, dev_alias] if x]
+        prod_qualified_list = [x.upper() for x in [prod_database, prod_schema, prod_alias] if x]
         primary_keys = [x.upper() for x in primary_keys]
     else:
-        dev_qualified_list = [x for x in [dev_database, dev_schema, model.alias] if x]
-        prod_qualified_list = [x for x in [prod_database, prod_schema, model.alias] if x]
+        dev_qualified_list = [x for x in [dev_database, dev_schema, dev_alias] if x]
+        prod_qualified_list = [x for x in [prod_database, prod_schema, prod_alias] if x]
 
     datadiff_model_config = dbt_parser.get_datadiff_model_config(model.meta)
 
@@ -228,14 +228,16 @@ def _get_prod_path_from_config(config, model, dev_database, dev_schema) -> Tuple
     return prod_database, prod_schema
 
 
-def _get_prod_path_from_manifest(model, prod_manifest) -> Union[Tuple[str, str], Tuple[None, None]]:
+def _get_prod_path_from_manifest(model, prod_manifest) -> Union[Tuple[str, str, str], Tuple[None, None, None]]:
     prod_database = None
     prod_schema = None
+    prod_alias = None
     prod_model = prod_manifest.nodes.get(model.unique_id, None)
     if prod_model:
         prod_database = prod_model.database
         prod_schema = prod_model.schema_
-    return prod_database, prod_schema
+        prod_alias = prod_model.alias
+    return prod_database, prod_schema, prod_alias
 
 
 def _local_diff(diff_vars: TDiffVars, json_output: bool = False) -> None:

tests/test_dbt.py

@@ -685,9 +685,11 @@ def test_get_prod_path_from_manifest_model_exists(self):
         mock_prod_manifest.nodes.get.return_value = mock_prod_model
         mock_prod_model.database = "prod_db"
         mock_prod_model.schema_ = "prod_schema"
-        prod_database, prod_schema = _get_prod_path_from_manifest(mock_model, mock_prod_manifest)
+        mock_prod_model.alias = "prod_alias"
+        prod_database, prod_schema, prod_alias = _get_prod_path_from_manifest(mock_model, mock_prod_manifest)
         self.assertEqual(prod_database, mock_prod_model.database)
         self.assertEqual(prod_schema, mock_prod_model.schema_)
+        self.assertEqual(prod_alias, mock_prod_model.alias)
 
     def test_get_prod_path_from_manifest_model_not_exists(self):
         mock_model = Mock()
@@ -697,9 +699,11 @@ def test_get_prod_path_from_manifest_model_not_exists(self):
         mock_prod_manifest.nodes.get.return_value = None
         mock_prod_model.database = "prod_db"
         mock_prod_model.schema_ = "prod_schema"
-        prod_database, prod_schema = _get_prod_path_from_manifest(mock_model, mock_prod_manifest)
+        mock_prod_model.alias = "prod_alias"
+        prod_database, prod_schema, prod_alias = _get_prod_path_from_manifest(mock_model, mock_prod_manifest)
         self.assertEqual(prod_database, None)
         self.assertEqual(prod_schema, None)
+        self.assertEqual(prod_alias, None)
 
     def test_get_diff_custom_schema_no_config_exception(self):
         config = TDatadiffConfig(prod_database="prod_db", prod_schema="prod_schema")
@@ -927,7 +931,7 @@ def test_get_diff_vars_call_get_prod_path_from_manifest(
         mock_dbt_parser.requires_upper = False
         mock_model.meta = None
         mock_dbt_parser.prod_manifest_obj = {"manifest_key": "manifest_value"}
-        mock_prod_path_from_manifest.return_value = ("prod_db", "prod_schema")
+        mock_prod_path_from_manifest.return_value = ("prod_db", "prod_schema", "prod_alias")
 
         diff_vars = _get_diff_vars(mock_dbt_parser, config, mock_model)