fix: using base_filters with FilterEqualFunction not working for relation fields

examples/extendsecurity/testdata.py

@@ -2,8 +2,8 @@
 import logging
 import random
 
-from .app import appbuilder, db, create_app
-from .app.models import ContactGroup, Gender, Contact, Company
+from app import appbuilder, db, create_app
+from app.models import ContactGroup, Gender, Contact, Company
 
 
 log = logging.getLogger(__name__)

flask_appbuilder/models/sqla/interface.py

@@ -344,8 +344,10 @@ def get_inner_filters(self, filters: Optional[Filters]) -> Filters:
                 if not is_column_dotted(flt.column_name):
                     _filters.append((flt.column_name, flt.__class__, value))
                 elif self.is_relation_many_to_one(
-                    flt.column_name
-                ) or self.is_relation_one_to_one(flt.column_name):
+                    get_column_root_relation(flt.column_name)
+                ) or self.is_relation_one_to_one(
+                    get_column_root_relation(flt.column_name)
+                ):
                     _filters.append((flt.column_name, flt.__class__, value))
             inner_filters.add_filter_list(_filters)
         return inner_filters

flask_appbuilder/tests/test_mvc.py

@@ -19,7 +19,11 @@
 from flask_appbuilder.models.generic import PSSession
 from flask_appbuilder.models.generic.interface import GenericInterface
 from flask_appbuilder.models.group import aggregate_avg, aggregate_count, aggregate_sum
-from flask_appbuilder.models.sqla.filters import FilterEqual, FilterStartsWith
+from flask_appbuilder.models.sqla.filters import (
+    FilterEqual,
+    FilterEqualFunction,
+    FilterStartsWith,
+)
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_appbuilder.views import CompactCRUDMixin, MasterDetailView, ModelView
 from flask_wtf import CSRFProtect
@@ -566,6 +570,28 @@ class Model1Filtered2View(ModelView):
             datamodel = SQLAInterface(Model1)
             base_filters = [["field_integer", FilterEqual, 0]]
 
+        def get_model1_by_name(datamodel, name):
+            model = (
+                datamodel.session.query(Model1)
+                .filter_by(field_string=name)
+                .one_or_none()
+            )
+            return model
+
+        class Model2FilterEqualFunctionView(ModelView):
+            datamodel = SQLAInterface(Model2)
+            base_filters = [
+                [
+                    "group",
+                    FilterEqualFunction,
+                    lambda: get_model1_by_name(
+                        Model2FilterEqualFunctionView.datamodel, "test1"
+                    ),
+                ]
+            ]
+            list_columns = ["group"]
+            search_columns = ["field_integer"]
+
         class Model2ChartView(ChartView):
             datamodel = SQLAInterface(Model2)
             chart_title = "Test Model1 Chart"
@@ -668,6 +694,11 @@ def enabled(self):
         self.appbuilder.add_view(
             Model1Filtered2View, "Model1Filtered2", category="Model1"
         )
+        self.appbuilder.add_view(
+            Model2FilterEqualFunctionView,
+            "Model2FilterEqualFunction",
+            category="Model2",
+        )
         self.appbuilder.add_view(
             Model1FormattedView, "Model1FormattedView", category="Model1FormattedView"
         )
@@ -713,7 +744,7 @@ def test_fab_views(self):
         """
         Test views creation and registration
         """
-        self.assertEqual(len(self.appbuilder.baseviews), 37)
+        self.assertEqual(len(self.appbuilder.baseviews), 38)
 
     def test_back(self):
         """
@@ -1309,6 +1340,21 @@ def test_model_base_filter(self):
         self.assertIn("test0", data)
         self.assertNotIn("test1", data)
 
+    def test_filterequalfunction_with_relation(self):
+        """
+        Test FilterEqualFunction
+        """
+        client = self.app.test_client()
+        self.browser_login(client, USERNAME_ADMIN, PASSWORD_ADMIN)
+
+        # Base filter string starts with
+        rv = client.get("/model2filterequalfunctionview/list/")
+        self.assertEqual(rv.status_code, 200)
+        data = rv.data.decode("utf-8")
+        self.assertIn("test1", data)
+        self.assertNotIn("test0", data)
+        self.assertNotIn("test2", data)
+
     def test_model_list_method_field(self):
         """
         Tests a model's field has a method