Merge pull request #531 from dlawin/issue_530

add support for two part id

Author: dlawin

data_diff/dbt.py

@@ -93,11 +93,6 @@ def dbt_diff(
     else:
         dbt_parser.set_connection()
 
-    if config_prod_database is None:
-        raise ValueError(
-            "Expected a value for prod_database: OR prod_database: AND prod_schema: under \nvars:\n  data_diff: "
-        )
-
     for model in models:
         diff_vars = _get_diff_vars(
             dbt_parser, config_prod_database, config_prod_schema, config_prod_custom_schema, model
@@ -154,12 +149,12 @@ def _get_diff_vars(
         prod_schema = dev_schema
 
     if dbt_parser.requires_upper:
-        dev_qualified_list = [x.upper() for x in [dev_database, dev_schema, model.alias]]
-        prod_qualified_list = [x.upper() for x in [prod_database, prod_schema, model.alias]]
+        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]
         primary_keys = [x.upper() for x in primary_keys]
     else:
-        dev_qualified_list = [dev_database, dev_schema, model.alias]
-        prod_qualified_list = [prod_database, prod_schema, model.alias]
+        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]
 
     where_filter = None
     if model.meta:
@@ -278,7 +273,7 @@ def _cloud_diff(diff_vars: DiffVars, datasource_id: int, api: DatafoldAPI) -> No
     try:
         diff_id = api.create_data_diff(payload=payload)
         diff_url = f"{api.host}/datadiffs/{diff_id}/overview"
-        rich.print(f"{diff_vars.dev_path[2]}: {diff_url}")
+        rich.print(f"{diff_vars.dev_path[-1]}: {diff_url}")
 
         if diff_id is None:
             raise Exception(f"Api response did not contain a diff_id")

tests/test_dbt.py

@@ -663,38 +663,6 @@ def test_diff_is_not_cloud(self, mock_print, mock_dbt_parser, mock_cloud_diff, m
         mock_local_diff.assert_called_once_with(expected_diff_vars)
         mock_print.assert_not_called()
 
-    @patch("data_diff.dbt._get_diff_vars")
-    @patch("data_diff.dbt._local_diff")
-    @patch("data_diff.dbt._cloud_diff")
-    @patch("data_diff.dbt_parser.DbtParser.__new__")
-    @patch("data_diff.dbt.rich.print")
-    def test_diff_no_prod_configs(
-        self, mock_print, mock_dbt_parser, mock_cloud_diff, mock_local_diff, mock_get_diff_vars
-    ):
-        mock_dbt_parser_inst = Mock()
-        mock_dbt_parser.return_value = mock_dbt_parser_inst
-        mock_model = Mock()
-        expected_dbt_vars_dict = {
-            "datasource_id": 1,
-        }
-
-        mock_dbt_parser_inst.get_models.return_value = [mock_model]
-        mock_dbt_parser_inst.get_datadiff_variables.return_value = expected_dbt_vars_dict
-        connection = None
-        threads = None
-        where = "a_string"
-        expected_diff_vars = DiffVars(["dev"], ["prod"], ["pks"], connection, threads, where)
-        mock_get_diff_vars.return_value = expected_diff_vars
-        with self.assertRaises(ValueError):
-            dbt_diff(is_cloud=False)
-
-        mock_dbt_parser_inst.get_models.assert_called_once()
-        mock_dbt_parser_inst.set_connection.assert_called_once()
-        mock_dbt_parser_inst.get_primary_keys.assert_not_called()
-        mock_cloud_diff.assert_not_called()
-        mock_local_diff.assert_not_called()
-        mock_print.assert_not_called()
-
     @patch("data_diff.dbt._get_diff_vars")
     @patch("data_diff.dbt._local_diff")
     @patch("data_diff.dbt._cloud_diff")
@@ -746,14 +714,12 @@ def test_diff_only_prod_schema(
         where = "a_string"
         expected_diff_vars = DiffVars(["dev"], ["prod"], ["pks"], connection, threads, where)
         mock_get_diff_vars.return_value = expected_diff_vars
-        with self.assertRaises(ValueError):
-            dbt_diff(is_cloud=False)
+        dbt_diff(is_cloud=False)
 
         mock_dbt_parser_inst.get_models.assert_called_once()
         mock_dbt_parser_inst.set_connection.assert_called_once()
-        mock_dbt_parser_inst.get_primary_keys.assert_not_called()
         mock_cloud_diff.assert_not_called()
-        mock_local_diff.assert_not_called()
+        mock_local_diff.assert_called_once_with(expected_diff_vars)
         mock_print.assert_not_called()
 
     @patch("data_diff.dbt._initialize_api")