Resolve deprecation warning re Table.exists() (#26616)

The deprecation warning tells us we need to change Table.exists() to Inspector.has_table().  It turns out we're already using the right method, but we weren't passing it the right object.  It wants a table name but we were giving it a table.

(cherry picked from commit 2388bd7)

airflow/migrations/versions/0001_1_5_0_current_schema.py

@@ -26,9 +26,8 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy import func
+from sqlalchemy import func, inspect
 
-from airflow.compat.sqlalchemy import inspect
 from airflow.migrations.db_types import StringID
 
 # revision identifiers, used by Alembic.

airflow/migrations/versions/0002_1_5_0_create_is_encrypted.py

@@ -26,8 +26,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-
-from airflow.compat.sqlalchemy import inspect
+from sqlalchemy import inspect
 
 # revision identifiers, used by Alembic.
 revision = '1507a7289a2f'

airflow/migrations/versions/0023_1_8_2_add_max_tries_column_to_task_instance.py

@@ -25,11 +25,10 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy import Column, Integer, String
+from sqlalchemy import Column, Integer, String, inspect
 from sqlalchemy.ext.declarative import declarative_base
 
 from airflow import settings
-from airflow.compat.sqlalchemy import inspect
 from airflow.models import DagBag
 
 # revision identifiers, used by Alembic.

airflow/migrations/versions/0028_1_10_0_add_kubernetes_resource_checkpointing.py

@@ -25,8 +25,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-
-from airflow.compat.sqlalchemy import inspect
+from sqlalchemy import inspect
 
 # revision identifiers, used by Alembic.
 revision = '33ae817a1ff4'

airflow/migrations/versions/0057_1_10_13_add_fab_tables.py

@@ -26,8 +26,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-
-from airflow.compat.sqlalchemy import inspect
+from sqlalchemy import inspect
 
 # revision identifiers, used by Alembic.
 revision = '92c57b58940d'

airflow/migrations/versions/0058_1_10_13_increase_length_of_fab_ab_view_menu_.py

@@ -26,8 +26,8 @@
 
 import sqlalchemy as sa
 from alembic import op
+from sqlalchemy import inspect
 
-from airflow.compat.sqlalchemy import inspect
 from airflow.migrations.db_types import StringID
 
 # revision identifiers, used by Alembic.

airflow/migrations/versions/0059_2_0_0_drop_user_and_chart.py

@@ -25,10 +25,9 @@
 
 import sqlalchemy as sa
 from alembic import op
+from sqlalchemy import inspect
 from sqlalchemy.dialects import mysql
 
-from airflow.compat.sqlalchemy import inspect
-
 # revision identifiers, used by Alembic.
 revision = 'cf5dc11e79ad'
 down_revision = '03afc6b6f902'

airflow/migrations/versions/0060_2_0_0_remove_id_column_from_xcom.py

@@ -27,9 +27,7 @@
 from collections import defaultdict
 
 from alembic import op
-from sqlalchemy import Column, Integer
-
-from airflow.compat.sqlalchemy import inspect
+from sqlalchemy import Column, Integer, inspect
 
 # revision identifiers, used by Alembic.
 revision = 'bbf4a7ad0465'

airflow/migrations/versions/0062_2_0_0_add_dagrun_run_type.py

@@ -27,10 +27,9 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy import Column, Integer, String
+from sqlalchemy import Column, Integer, String, inspect
 from sqlalchemy.ext.declarative import declarative_base
 
-from airflow.compat.sqlalchemy import inspect
 from airflow.utils.types import DagRunType
 
 # revision identifiers, used by Alembic.

airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py

@@ -26,9 +26,8 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy import func
+from sqlalchemy import func, inspect
 
-from airflow.compat.sqlalchemy import inspect
 from airflow.migrations.db_types import TIMESTAMP, StringID
 
 # revision identifiers, used by Alembic.

airflow/migrations/versions/0068_2_0_0_drop_kuberesourceversion_and_.py

@@ -26,8 +26,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-
-from airflow.compat.sqlalchemy import inspect
+from sqlalchemy import inspect
 
 # revision identifiers, used by Alembic.
 revision = 'bef4f3d11e8b'

airflow/utils/db.py

@@ -33,7 +33,6 @@
 
 import airflow
 from airflow import settings
-from airflow.compat.sqlalchemy import has_table
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.models import import_all_models
@@ -1643,7 +1642,7 @@ def drop_airflow_models(connection):
 
     migration_ctx = MigrationContext.configure(connection)
     version = migration_ctx._version
-    if has_table(connection, version):
+    if inspect(connection).has_table(version.name):
         version.drop(connection)
 
 

airflow/www/fab_security/sqla/manager.py

@@ -22,11 +22,10 @@
 from flask_appbuilder import const as c
 from flask_appbuilder.models.sqla import Base
 from flask_appbuilder.models.sqla.interface import SQLAInterface
-from sqlalchemy import and_, func, literal
+from sqlalchemy import and_, func, inspect, literal
 from sqlalchemy.orm.exc import MultipleResultsFound
 from werkzeug.security import generate_password_hash
 
-from airflow.compat import sqlalchemy as sqla_compat
 from airflow.www.fab_security.manager import BaseSecurityManager
 from airflow.www.fab_security.sqla.models import (
     Action,
@@ -99,7 +98,7 @@ def register_views(self):
     def create_db(self):
         try:
             engine = self.get_session.get_bind(mapper=None, clause=None)
-            inspector = sqla_compat.inspect(engine)
+            inspector = inspect(engine)
             if "ab_user" not in inspector.get_table_names():
                 log.info(c.LOGMSG_INF_SEC_NO_DB)
                 Base.metadata.create_all(engine)

docs/apache-airflow/img/airflow_erd.sha256

@@ -1 +1 @@
-866390aad1d155c75b4283c4d50ff56fb1f210f21dcd0e0955984bd08f26ac5c
+543fe0db520047b59d9d036b17d54b07f1031a2b6ef1f46dcd2ae970f14ab0e6