fire previous Fixed codes

agronholm · Sep 27, 2023 · ac1bdb0 · ac1bdb0
1 parent 1c00f16
commit ac1bdb0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 61 deletions.
diff --git a/src/sqlacodegen/generators.py b/src/sqlacodegen/generators.py
@@ -19,7 +19,6 @@
 import sqlalchemy
 from sqlalchemy import (
     ARRAY,
-    CHAR,
     Boolean,
     CheckConstraint,
     Column,
@@ -546,14 +545,6 @@ def render_column_type(self, coltype: object) -> str:
             ):
                 del kwargs["astext_type"]
 
-        if isinstance(coltype, CHAR):
-            # If the column type is CHAR and it has a non-None collation,
-            # include the collation argument in the kwargs dictionary
-            # and remove any corresponding argument from the args list.
-            if coltype.collation is not None:
-                kwargs["collation"] = repr(coltype.collation)
-                args.pop()
-
         if args or kwargs:
             return render_callable(coltype.__class__.__name__, *args, kwargs=kwargs)
         else:

diff --git a/tests/test_generator_tables.py b/tests/test_generator_tables.py
@@ -245,32 +245,6 @@ def test_mysql_column_types(generator: CodeGenerator) -> None:
     )
 
 
-@pytest.mark.parametrize("engine", ["mysql"], indirect=["engine"])
-def test_mysql_char_collation(generator: CodeGenerator) -> None:
-    Table(
-        "simple_items",
-        generator.metadata,
-        Column("id", mysql.INTEGER),
-        Column("name", mysql.CHAR(10, collation="utf8mb3_bin")),
-    )
-
-    validate_code(
-        generator.generate(),
-        """\
-        from sqlalchemy import CHAR, Column, Integer, MetaData, Table
-
-        metadata = MetaData()
-
-
-        t_simple_items = Table(
-            'simple_items', metadata,
-            Column('id', Integer),
-            Column('name', CHAR(10, collation='utf8mb3_bin'))
-        )
-        """,
-    )
-
-
 def test_constraints(generator: CodeGenerator) -> None:
     Table(
         "simple_items",

diff --git a/tests/test_generator_tables2.py b/tests/test_generator_tables2.py
@@ -245,32 +245,6 @@ def test_mysql_column_types(generator: CodeGenerator) -> None:
     )
 
 
-@pytest.mark.parametrize("engine", ["mysql"], indirect=["engine"])
-def test_mysql_char_collation(generator: CodeGenerator) -> None:
-    Table(
-        "simple_items",
-        generator.metadata,
-        Column("id", mysql.INTEGER),
-        Column("name", mysql.CHAR(10, collation="utf8mb4_unicode_ci")),
-    )
-
-    validate_code(
-        generator.generate(),
-        """\
-        from sqlalchemy import CHAR, Column, Integer, MetaData, Table
-
-        metadata = MetaData()
-
-
-        t_simple_items = Table(
-            'simple_items', metadata,
-            Column('id', Integer),
-            Column('name', CHAR(10, collation='utf8mb4_unicode_ci'))
-        )
-        """,
-    )
-
-
 def test_constraints(generator: CodeGenerator) -> None:
     Table(
         "simple_items",