[MAINTENANCE] Fix schema_name deprecation warning

great_expectations/datasource/fluent/sql_datasource.py

@@ -1055,12 +1055,15 @@ class TableAsset(_SQLAsset):
 
     @pydantic.validator("schema_name", pre=True, always=True)
     @classmethod
-    def _schema_name_deprecation_warning(cls, v: str | Missing | None) -> str | Missing | None:
-        if v is MISSING:
-            return v
+    def _schema_name_deprecation_warning(
+        cls, v: str | Missing | None, values: dict
+    ) -> str | Missing | None:
+        if v is MISSING or v is None:
+            return MISSING
         # deprecated-v1.14.0
+        asset_name = values.get("name", "unknown")
         warnings.warn(
-            "`schema_name` is deprecated."
+            f"`schema_name` is deprecated on asset '{asset_name}'."
             " Pass the schema in your datasource's connection configuration instead.",
             category=DeprecationWarning,
         )

pyproject.toml

@@ -502,11 +502,6 @@ filterwarnings = [
     # --------------------------------------- Great Expectations Deprecation Warnings ----------------------------------
     "once:The condition_parser parameter is deprecated:DeprecationWarning",
     "once:Passing a string to the row_condition parameter is deprecated:DeprecationWarning",
-    # Existing cloud configs store "schema_name": null. During deserialization, Pydantic passes
-    # None to the validator which triggers the deprecation warning. The TableAsset.dict() override
-    # strips schema_name from new serializations, so these will clean up over time.
-    'once:The `schema_name` argument is deprecated:DeprecationWarning',
-    'once:`schema_name` is deprecated:DeprecationWarning',
 
     # --------------------------------------- TEMPORARY IGNORES --------------------------------------------------------
     # The warnings in this section should be addressed (fixed or ignored) but are ignored here temporarily to help allow

tests/datasource/fluent/test_sql_datasources.py

@@ -13,6 +13,8 @@
 from great_expectations.datasource.fluent import GxDatasourceWarning, SQLDatasource
 from great_expectations.datasource.fluent.sql_datasource import (
     DEFAULT_INITIAL_QUOTE_CHARACTERS,
+    MISSING,
+    Missing,
     TableAsset,
     to_lower_if_not_quoted,
 )
@@ -472,6 +474,35 @@ def test_table_name_serialization_preserves_quotes(
             serialized = table_asset.dict()
             assert serialized["table_name"] == serialized_name
 
+    @pytest.mark.parametrize(
+        "schema_name",
+        [
+            pytest.param(MISSING, id="MISSING"),
+            pytest.param(None, id="None"),
+        ],
+    )
+    def test_schema_name_non_string_values_normalize_to_missing_without_warning(
+        self,
+        schema_name: Missing | None,
+    ) -> None:
+        with warnings.catch_warnings(record=True) as caught:
+            warnings.simplefilter("always")
+            asset = TableAsset(name="my_asset", table_name="my_table", schema_name=schema_name)
+
+        deprecation_warnings = [
+            w
+            for w in caught
+            if issubclass(w.category, DeprecationWarning) and "schema_name" in str(w.message)
+        ]
+        assert len(deprecation_warnings) == 0
+        assert asset.schema_name is MISSING
+
+    def test_schema_name_string_value_emits_deprecation_warning_with_asset_name(self) -> None:
+        with pytest.warns(DeprecationWarning, match=r"my_asset"):
+            asset = TableAsset(name="my_asset", table_name="my_table", schema_name="public")
+
+        assert asset.schema_name == "public"
+
 
 if __name__ == "__main__":
     pytest.main([__file__, "-vv"])