fixing mr conflict

Signed-off-by: Cortland Goffena <30168413+cmgoffena13@users.noreply.github.com>

Author: cmgoffena13

sqlmesh/core/engine_adapter/fabric.py

@@ -11,14 +11,14 @@
 from sqlmesh.core.engine_adapter.shared import (
     CommentCreationTable,
     CommentCreationView,
+    DataObject,
     InsertOverwriteStrategy,
 )
 from sqlmesh.utils.errors import SQLMeshError
 from sqlmesh.utils.connection_pool import ConnectionPool
 from sqlmesh.core.schema_diff import TableAlterOperation
 from sqlmesh.utils import random_id
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -224,6 +224,31 @@ def set_current_catalog(self, catalog_name: t.Optional[str]) -> None:
 
         self._target_catalog = target_catalog
 
+    def _get_data_objects(
+        self, schema_name: t.Union[str, exp.Table], object_names: t.Optional[t.Set[str]] = None
+    ) -> t.List[DataObject]:
+        objects = super()._get_data_objects(schema_name, object_names)
+        # Fabric uses None as "default catalog" so we skip reconnects. Other engines
+        # return a real warehouse name here; fill it in so this listing matches them
+        # and so the data-object cache key matches lookups that use that name.
+        catalog = (
+            self.get_current_catalog()
+            or self._default_catalog
+            or self._extra_config.get("database")
+        )
+        if not catalog:
+            return objects
+        return [
+            DataObject(
+                catalog=obj.catalog or catalog,
+                schema=obj.schema_name,
+                name=obj.name,
+                type=obj.type,
+                clustering_key=obj.clustering_key,
+            )
+            for obj in objects
+        ]
+
     def alter_table(
         self,
         alter_expressions: t.Union[t.List[exp.Alter], t.List[TableAlterOperation]],

tests/core/engine_adapter/test_fabric.py

@@ -11,7 +11,7 @@
 from sqlmesh.core.engine_adapter import FabricEngineAdapter
 from sqlmesh.core.engine_adapter.fabric import FabricHttpClient
 from tests.core.engine_adapter import to_sql_calls
-from sqlmesh.core.engine_adapter.shared import DataObject
+from sqlmesh.core.engine_adapter.shared import DataObject, DataObjectType
 
 pytestmark = [pytest.mark.engine, pytest.mark.fabric]
 
@@ -494,3 +494,31 @@ def test_create_warehouse_unrelated_conflict_still_raises(
 
     with pytest.raises(requests.HTTPError):
         fabric_http_client.create_warehouse("my_warehouse")
+
+
+def test_get_data_objects_uses_default_catalog_when_current_is_none(
+    make_mocked_engine_adapter: t.Callable,
+    mocker: MockerFixture,
+) -> None:
+    adapter = make_mocked_engine_adapter(
+        FabricEngineAdapter,
+        default_catalog="ci_abc",
+        database="ci_abc",
+        patch_get_data_objects=False,
+    )
+    assert adapter.get_current_catalog() is None
+
+    mocker.patch.object(
+        adapter,
+        "fetchdf",
+        return_value=pd.DataFrame([{"name": "test_table", "schema_name": "dbo", "type": "TABLE"}]),
+    )
+
+    assert adapter._get_data_objects("dbo") == [
+        DataObject(
+            catalog="ci_abc",
+            schema="dbo",
+            name="test_table",
+            type=DataObjectType.TABLE,
+        )
+    ]