Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cascade to dag_tag to dag foreignkey #23444

Merged
merged 3 commits into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion airflow/migrations/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ def get_mssql_table_constraints(conn, table_name):
FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS tc
JOIN INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE AS ccu ON ccu.CONSTRAINT_NAME = tc.CONSTRAINT_NAME
WHERE tc.TABLE_NAME = '{table_name}' AND
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😱 This should be a placeholder/param pass to execute, not built in to the string. (Separate to this PR)

(tc.CONSTRAINT_TYPE = 'PRIMARY KEY' or UPPER(tc.CONSTRAINT_TYPE) = 'UNIQUE')
(tc.CONSTRAINT_TYPE = 'PRIMARY KEY' or UPPER(tc.CONSTRAINT_TYPE) = 'UNIQUE'
or UPPER(tc.CONSTRAINT_TYPE) = 'FOREIGN KEY')
Comment on lines +38 to +39
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of these is not upper-cased! But do you really need UPPER? From what I remember, other migrations don’t do this amd still work OK.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there's any other migration that tried dropping an unnamed foreign key in MSSQL. Most other foreign keys are named and easily dropped. This particular case is one of those unnamed foreign keys. There's no other way to drop unnamed foreign key in MSSQL other than using this query or using sqlalchemy inspect.

For the one that's not uppercased, it has been like that and working. My addition to the code is that of foreign key.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, and the other two can be in lower case? I would imagine we should be able to get rid of those UPPER;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea. Possible but it'll require editing released migrations. Where ever it was used, it compares to an upper case value.
In my opinion we should keep it with the UPPER case

"""
result = conn.execute(query).fetchall()
constraint_dict = defaultdict(lambda: defaultdict(list))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#
# 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 cascade to dag_tag foreign key

Revision ID: 3c94c427fdf6
Revises: 1de7bc13c950
Create Date: 2022-05-03 09:47:41.957710

"""

from alembic import op

from airflow.migrations.utils import get_mssql_table_constraints

# revision identifiers, used by Alembic.
revision = '3c94c427fdf6'
down_revision = '1de7bc13c950'
branch_labels = None
depends_on = None
airflow_version = '2.3.2'


def upgrade():
"""Apply Add cascade to dag_tag foreignkey"""
conn = op.get_bind()
if conn.dialect.name == 'sqlite':
naming_convention = {
"fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
}
with op.batch_alter_table(
'dag_tag', naming_convention=naming_convention, recreate='always'
) as batch_op:
batch_op.drop_constraint('fk_dag_tag_dag_id_dag', type_='foreignkey')
batch_op.create_foreign_key(
"dag_tag_dag_id_fkey", 'dag', ['dag_id'], ['dag_id'], ondelete='CASCADE'
)
else:
with op.batch_alter_table('dag_tag') as batch_op:
if conn.dialect.name == 'mssql':
constraints = get_mssql_table_constraints(conn, 'dag_tag')
Fk, _ = constraints['FOREIGN KEY'].popitem()
batch_op.drop_constraint(Fk, type_='foreignkey')
if conn.dialect.name == 'postgresql':
batch_op.drop_constraint('dag_tag_dag_id_fkey', type_='foreignkey')
if conn.dialect.name == 'mysql':
batch_op.drop_constraint('dag_tag_ibfk_1', type_='foreignkey')

batch_op.create_foreign_key(
"dag_tag_dag_id_fkey", 'dag', ['dag_id'], ['dag_id'], ondelete='CASCADE'
)


def downgrade():
"""Unapply Add cascade to dag_tag foreignkey"""
conn = op.get_bind()
if conn.dialect.name == 'sqlite':
with op.batch_alter_table('dag_tag') as batch_op:
batch_op.drop_constraint('dag_tag_dag_id_fkey', type_='foreignkey')
batch_op.create_foreign_key("fk_dag_tag_dag_id_dag", 'dag', ['dag_id'], ['dag_id'])
else:
with op.batch_alter_table('dag_tag') as batch_op:
batch_op.drop_constraint('dag_tag_dag_id_fkey', type_='foreignkey')
batch_op.create_foreign_key(
None,
'dag',
['dag_id'],
['dag_id'],
)
8 changes: 6 additions & 2 deletions airflow/models/dag.py
Original file line number Diff line number Diff line change
Expand Up @@ -2638,7 +2638,11 @@ class DagTag(Base):

__tablename__ = "dag_tag"
name = Column(String(100), primary_key=True)
dag_id = Column(String(ID_LEN), ForeignKey('dag.dag_id'), primary_key=True)
dag_id = Column(
String(ID_LEN),
ForeignKey('dag.dag_id', name='dag_tag_dag_id_fkey', ondelete='CASCADE'),
primary_key=True,
)

def __repr__(self):
return self.name
Expand Down Expand Up @@ -2689,7 +2693,7 @@ class DagModel(Base):
timetable_description = Column(String(1000), nullable=True)

# Tags for view filter
tags = relationship('DagTag', cascade='all,delete-orphan', backref=backref('dag'))
tags = relationship('DagTag', cascade='all, delete, delete-orphan', backref=backref('dag'))

max_active_tasks = Column(Integer, nullable=False)
max_active_runs = Column(Integer, nullable=True)
Expand Down
4 changes: 3 additions & 1 deletion docs/apache-airflow/migrations-ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``1de7bc13c950`` (head) | ``b1b348e02d07`` | ``2.3.1`` | Add index for ``event`` column in ``log`` table. |
| ``3c94c427fdf6`` (head) | ``1de7bc13c950`` | ``2.3.2`` | Add cascade to dag_tag foreign key |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``1de7bc13c950`` | ``b1b348e02d07`` | ``2.3.1`` | Add index for ``event`` column in ``log`` table. |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``b1b348e02d07`` | ``75d5ed6c2b43`` | ``2.3.0`` | Update dag.default_view to grid |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
Expand Down