Lee-W commented on code in PR #66487: URL: https://github.com/apache/airflow/pull/66487#discussion_r3199836448
########## airflow-core/src/airflow/migrations/versions/0114_3_3_0_add_allow_producer_teams_to_dag_schedule_asset_reference.py: ########## @@ -0,0 +1,49 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +""" +Add allow_producer_teams column to dag_schedule_asset_reference table. + +Revision ID: a7f3b2c1d4e5 +Revises: b8f3e4a1d2c9 +Create Date: 2026-05-06 12:00:00.000000 + +""" + +from __future__ import annotations + +import sqlalchemy as sa +from alembic import op + +revision = "a7f3b2c1d4e5" +down_revision = "b8f3e4a1d2c9" +branch_labels = None +depends_on = None +airflow_version = "3.3.0" + + +def upgrade(): + """Add allow_producer_teams column to dag_schedule_asset_reference.""" + with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op: + batch_op.add_column(sa.Column("allow_producer_teams", sa.JSON(), nullable=False, server_default="[]")) + + +def downgrade(): + """Remove allow_producer_teams column from dag_schedule_asset_reference.""" + with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op: + batch_op.drop_column("allow_producer_teams") Review Comment: ```suggestion from airflow.migrations.utils import disable_sqlite_fkeys with disable_sqlite_fkeys(op): with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op: batch_op.drop_column("allow_producer_teams") ``` ########## airflow-core/tests/unit/assets/test_manager.py: ########## @@ -326,12 +326,21 @@ def _make_dag(dag_id: str) -> DagModel: return dag -def _make_asset_model(allow_producer_teams: list[str] | None = None) -> AssetModel: +def _make_asset_model( + scheduled_dags: dict[str, list[str]] | None = None, +) -> AssetModel: + """Create a mock AssetModel. + + :param scheduled_dags: mapping of dag_id -> allow_producer_teams for each consumer reference. + """ model = mock.Mock(spec=AssetModel) - extra = {} - if allow_producer_teams: - extra["allow_producer_teams"] = allow_producer_teams - model.extra = extra + refs = [] + for dag_id, teams in (scheduled_dags or {}).items(): + ref = mock.Mock() + ref.dag_id = dag_id + ref.allow_producer_teams = teams + refs.append(ref) + model.scheduled_dags = refs Review Comment: ```suggestion model.scheduled_dags = [ mock.Mock(dag_id=dag_id, allow_producer_teams=teams) for dag_id, teams in (scheduled_dags or {}).items() ] ``` ########## airflow-core/tests/unit/dag_processing/test_collection.py: ########## @@ -327,6 +327,45 @@ def test_change_asset_property_sync_extra(self, dag_maker, session): assert len(orm_assets) == 1 assert next(iter(orm_assets.values())).extra == {"foo": "new"} + @pytest.mark.usefixtures("testing_dag_bundle") + def test_sync_assets_preserves_allow_producer_teams_from_other_bundle(self, dag_maker, session): + """When a producer bundle (without allow_producer_teams) is synced after a consumer bundle + (with allow_producer_teams), the stored allow_producer_teams must not be wiped out.""" + from airflow.models.asset import DagScheduleAssetReference Review Comment: Could we move it to the top? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
