Skip to content

Commit

Permalink
Fix FAB actions with for models with composite PKs (#11753)
Browse files Browse the repository at this point in the history
This fixes #11513 -- and has been submitted upstream to FAB as
dpgaspar/Flask-AppBuilder#1493, once that is
merged we can remove this override.

GitOrigin-RevId: 28229e990894531d0aaa3f29fe68682c8b01430a
  • Loading branch information
ashb authored and Cloud Composer Team committed Mar 9, 2022
1 parent 5aa192d commit cf64f32
Showing 1 changed file with 39 additions and 0 deletions.
39 changes: 39 additions & 0 deletions airflow/www/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
# under the License.
import json
import time
from typing import Any, List, Optional
from urllib.parse import urlencode

import markdown
import sqlalchemy as sqla
from flask import Markup, Response, request, url_for
from flask_appbuilder.forms import FieldConverter
from flask_appbuilder.models.filters import Filters
from flask_appbuilder.models.sqla import filters as fab_sqlafilters
from flask_appbuilder.models.sqla.interface import SQLAInterface
from pygments import highlight, lexers
Expand Down Expand Up @@ -437,6 +439,43 @@ def is_utcdatetime(self, col_name):
isinstance(obj.impl, UtcDateTime)
return False

# This is a local fix until https://github.com/dpgaspar/Flask-AppBuilder/pull/1493 is merged and released.
def get(
self,
id,
filters: Optional[Filters] = None,
select_columns: Optional[List[str]] = None,
) -> Any:
"""
Returns the result for a model get, applies filters and supports dotted
notation for joins and granular selecting query columns.
:param id: The model id (pk).
:param filters: A Filter class that contains all filters to apply.
:param select_columns: A List of columns to be specifically selected.
on the query. Supports dotted notation.
:return: Model instance if found, or none
"""
pk = self.get_pk_name()
if filters:
_filters = filters.copy()
else:
_filters = Filters(self.filter_converter_class, self)

if self.is_pk_composite():
for _pk, _id in zip(pk, id):
_filters.add_filter(_pk, self.FilterEqual, _id)
else:
_filters.add_filter(pk, self.FilterEqual, id)
query = self.session.query(self.obj)
item = self.apply_all(
query, _filters, select_columns=select_columns
).one_or_none()
if item:
if hasattr(item, self.obj.__name__):
return getattr(item, self.obj.__name__)
return item

filter_converter_class = UtcAwareFilterConverter


Expand Down

0 comments on commit cf64f32

Please sign in to comment.