Revert "pep484 updates"

This reverts commit 03aeeb0c3701d67134885c85b187e9e6966d7d55.

diff --git a/alembic/autogenerate/render.py b/alembic/autogenerate/render.py
index ffc277db81d174333d0f8892d28e464343ebcc37..50c51fa9304a13b038c24397c112efbec3167058 100644 (file)
--- a/alembic/autogenerate/render.py
+++ b/alembic/autogenerate/render.py
@@ -505,7 +505,6 @@ def _alter_column(
     type_ = op.modify_type
     nullable = op.modify_nullable
     comment = op.modify_comment
-    newname = op.modify_name
     autoincrement = op.kw.get("autoincrement", None)
     existing_type = op.existing_type
     existing_nullable = op.existing_nullable
@@ -534,8 +533,6 @@ def _alter_column(
         rendered = _render_server_default(server_default, autogen_context)
         text += ",\n%sserver_default=%s" % (indent, rendered)
 
-    if newname is not None:
-        text += ",\n%snew_column_name=%r" % (indent, newname)
     if type_ is not None:
         text += ",\n%stype_=%s" % (indent, _repr_type(type_, autogen_context))
     if nullable is not None:

diff --git a/alembic/ddl/base.py b/alembic/ddl/base.py
index 7c36a887326b27f8b46c6d1f04c1955023583385..bd55c56d570493202a6bd6c9151a65c07325676a 100644 (file)
--- a/alembic/ddl/base.py
+++ b/alembic/ddl/base.py
@@ -299,13 +299,9 @@ def format_server_default(
     compiler: DDLCompiler,
     default: Optional[_ServerDefault],
 ) -> str:
-    # this can be updated to use compiler.render_default_string
-    # for SQLAlchemy 2.0 and above; not in 1.4
-    default_str = compiler.get_column_default_string(
+    return compiler.get_column_default_string(
         Column("x", Integer, server_default=default)
     )
-    assert default_str is not None
-    return default_str
 
 
 def format_type(compiler: DDLCompiler, type_: TypeEngine) -> str:

diff --git a/alembic/ddl/impl.py b/alembic/ddl/impl.py
index 96b03f6f7c00956706c58cc843f002dd2d8d5854..c116fcfa6120f38e25fe2aeba89c1c63d5834840 100644 (file)
--- a/alembic/ddl/impl.py
+++ b/alembic/ddl/impl.py
@@ -46,6 +46,7 @@ if TYPE_CHECKING:
     from sqlalchemy.engine.reflection import Inspector
     from sqlalchemy.sql import ClauseElement
     from sqlalchemy.sql import Executable
+    from sqlalchemy.sql.elements import ColumnElement
     from sqlalchemy.sql.elements import quoted_name
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.schema import ForeignKeyConstraint
@@ -439,7 +440,7 @@ class DefaultImpl(metaclass=ImplMeta):
     def drop_table_comment(self, table: Table) -> None:
         self._exec(schema.DropTableComment(table))
 
-    def create_column_comment(self, column: Column[Any]) -> None:
+    def create_column_comment(self, column: ColumnElement[Any]) -> None:
         self._exec(schema.SetColumnComment(column))
 
     def drop_index(self, index: Index, **kw: Any) -> None:

diff --git a/tests/test_autogen_render.py b/tests/test_autogen_render.py
index ed31183e8c0a2242c0dec692f751ccb3e72e3623..600e57834fdf07d89479c774228f21aad6af2544 100644 (file)
--- a/tests/test_autogen_render.py
+++ b/tests/test_autogen_render.py
@@ -1327,18 +1327,6 @@ class AutogenRenderTest(TestBase):
             {"from mypackage import MySpecialType"},
         )
 
-    def test_render_modify_name(self):
-        op_obj = ops.AlterColumnOp(
-            "sometable",
-            "somecolumn",
-            modify_name="newcolumnname",
-        )
-        eq_ignore_whitespace(
-            autogenerate.render_op_text(self.autogen_context, op_obj),
-            "op.alter_column('sometable', 'somecolumn', "
-            "new_column_name='newcolumnname')",
-        )
-
     def test_render_modify_type(self):
         op_obj = ops.AlterColumnOp(
             "sometable",