simplify

Author: dlawin

data_diff/dbt.py

@@ -60,7 +60,9 @@ def dbt_diff(
     config_prod_database = datadiff_variables.get("prod_database")
     config_prod_schema = datadiff_variables.get("prod_schema")
     datasource_id = datadiff_variables.get("datasource_id")
-    disable_custom_schemas = datadiff_variables.get("disable_custom_schemas")
+    custom_schemas = datadiff_variables.get("custom_schemas")
+    # custom schemas is default dbt behavior, so default to True if the var doesn't exist
+    custom_schemas = True if custom_schemas is None else custom_schemas
 
     if not is_cloud:
         dbt_parser.set_connection()
@@ -72,7 +74,7 @@ def dbt_diff(
 
     for model in models:
         diff_vars = _get_diff_vars(
-            dbt_parser, config_prod_database, config_prod_schema, model, datasource_id, disable_custom_schemas
+            dbt_parser, config_prod_database, config_prod_schema, model, datasource_id, custom_schemas
         )
 
         if is_cloud and len(diff_vars.primary_keys) > 0:
@@ -98,7 +100,7 @@ def _get_diff_vars(
     config_prod_schema: Optional[str],
     model,
     datasource_id: int,
-    disable_custom_schemas: Optional[bool],
+    custom_schemas: bool,
 ) -> DiffVars:
     dev_database = model.database
     dev_schema = model.schema_
@@ -107,10 +109,10 @@ def _get_diff_vars(
     prod_database = config_prod_database if config_prod_database else dev_database
     prod_schema = config_prod_schema if config_prod_schema else dev_schema
 
-    # if project has not disabled custom schemas
+    # if project has custom schemas (default)
     # need to construct the prod schema as <prod_target_schema>_<custom_schema>
     # https://docs.getdbt.com/docs/build/custom-schemas
-    if not disable_custom_schemas and model.config.schema_:
+    if custom_schemas and model.config.schema_:
         prod_schema = prod_schema + "_" + model.config.schema_
 
     if dbt_parser.requires_upper: