Merge "Fix issues in autogenerate of function index removal" into main

3 files changed, 11 insertions, 7 deletions

diff --git a/alembic/testing/requirements.py b/alembic/testing/requirements.py
index 989c7cd..a4a6045 100644
--- a/alembic/testing/requirements.py
+++ b/alembic/testing/requirements.py
@@ -75,13 +75,6 @@ class SuiteRequirements(Requirements):
         return exclusions.closed()
 
     @property
-    def sqlalchemy_13(self):
-        return exclusions.skip_if(
-            lambda config: not util.sqla_13,
-            "SQLAlchemy 1.3 or greater required",
-        )
-
-    @property
     def sqlalchemy_14(self):
         return exclusions.skip_if(
             lambda config: not util.sqla_14,
diff --git a/alembic/testing/warnings.py b/alembic/testing/warnings.py
index 86d45a0..e87136b 100644
--- a/alembic/testing/warnings.py
+++ b/alembic/testing/warnings.py
@@ -10,6 +10,8 @@ import warnings
 
 from sqlalchemy import exc as sa_exc
 
+from ..util import sqla_14
+
 
 def setup_filters():
     """Set global warning behavior for the test suite."""
@@ -21,6 +23,13 @@ def setup_filters():
 
     # some selected deprecations...
     warnings.filterwarnings("error", category=DeprecationWarning)
+    if not sqla_14:
+        # 1.3 uses pkg_resources in PluginLoader
+        warnings.filterwarnings(
+            "ignore",
+            "pkg_resources is deprecated as an API",
+            DeprecationWarning,
+        )
     try:
         import pytest
     except ImportError:
diff --git a/alembic/util/sqla_compat.py b/alembic/util/sqla_compat.py
index a767e7d..cab9949 100644
--- a/alembic/util/sqla_compat.py
+++ b/alembic/util/sqla_compat.py
@@ -415,6 +415,8 @@ def _textual_index_column(
         return c
     elif isinstance(text_, TextClause):
         return _textual_index_element(table, text_)
+    elif isinstance(text_, _textual_index_element):
+        return _textual_index_column(table, text_.text)
     elif isinstance(text_, sql.ColumnElement):
         return _copy_expression(text_, table)
     else: