|
35 | 35 | check_references_identifier, |
36 | 36 | parse_autoincrement, |
37 | 37 | parse_checks, |
| 38 | + parse_column_collations, |
38 | 39 | parse_column_comments, |
39 | 40 | parse_uniques, |
40 | 41 | rewrite_check_expression, |
@@ -1444,6 +1445,7 @@ def create_table_sql( |
1444 | 1445 | _column_comments: Mapping[str, ColumnComments] | None = None, |
1445 | 1446 | _autoincrement: str | None = None, |
1446 | 1447 | _uniques: Iterable[Unique] | None = None, |
| 1448 | + _column_collations: Mapping[str, str] | None = None, |
1447 | 1449 | ) -> str: |
1448 | 1450 | """ |
1449 | 1451 | Returns the SQL ``CREATE TABLE`` statement for creating the specified table. |
@@ -1493,6 +1495,10 @@ def create_table_sql( |
1493 | 1495 | resolve_casing(name, columns): comments |
1494 | 1496 | for name, comments in (_column_comments or {}).items() |
1495 | 1497 | } |
| 1498 | + column_collations = { |
| 1499 | + resolve_casing(name, columns): collation |
| 1500 | + for name, collation in (_column_collations or {}).items() |
| 1501 | + } |
1496 | 1502 | checks = list(_checks or ()) |
1497 | 1503 | checks_by_column: dict[str, list[Check]] = {} |
1498 | 1504 | table_checks: list[Check] = [] |
@@ -1609,6 +1615,10 @@ def sort_key(p): |
1609 | 1615 | raise ValueError("AUTOINCREMENT requires a single-column primary key") |
1610 | 1616 | for column_name, column_type in column_items: |
1611 | 1617 | column_extras = [] |
| 1618 | + if column_name in column_collations: |
| 1619 | + column_extras.append( |
| 1620 | + f"COLLATE {quote_identifier(column_collations[column_name])}" |
| 1621 | + ) |
1612 | 1622 | if column_name == single_pk: |
1613 | 1623 | column_extras.append("PRIMARY KEY") |
1614 | 1624 | if column_name == _autoincrement: |
@@ -2843,6 +2853,7 @@ def transform_sql( |
2843 | 2853 | try: |
2844 | 2854 | existing_checks = self.checks |
2845 | 2855 | existing_column_comments = parse_column_comments(self.schema) |
| 2856 | + existing_column_collations = parse_column_collations(self.schema) |
2846 | 2857 | existing_autoincrement = parse_autoincrement(self.schema) |
2847 | 2858 | existing_uniques = parse_uniques(self.schema) |
2848 | 2859 | except ParseError as ex: |
@@ -2908,6 +2919,12 @@ def transform_sql( |
2908 | 2919 | if owner not in drop: |
2909 | 2920 | create_table_column_comments[rename.get(owner) or owner] = comments |
2910 | 2921 |
|
| 2922 | + create_table_column_collations: dict[str, str] = {} |
| 2923 | + for column, collation in existing_column_collations.items(): |
| 2924 | + owner = resolve_casing(column, existing_columns) |
| 2925 | + if owner not in drop: |
| 2926 | + create_table_column_collations[rename.get(owner) or owner] = collation |
| 2927 | + |
2911 | 2928 | create_table_foreign_keys: list[ForeignKeyIndicator] = [] |
2912 | 2929 |
|
2913 | 2930 | if foreign_keys is not None: |
@@ -3088,6 +3105,7 @@ def fk_with_renamed_columns(fk: ForeignKey) -> ForeignKey: |
3088 | 3105 | _column_comments=create_table_column_comments, |
3089 | 3106 | _autoincrement=create_table_autoincrement, |
3090 | 3107 | _uniques=create_table_uniques, |
| 3108 | + _column_collations=create_table_column_collations, |
3091 | 3109 | ).strip() |
3092 | 3110 | ) |
3093 | 3111 |
|
|
0 commit comments