Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed omission of 'collation' keyword in existing CHAR type #286

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fixed omission of 'collation' keyword in existing CHAR type #286

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
44eec23
Fixed omission of 'collation' keyword in existing CHAR type
hyoj0942 Sep 25, 2023
3a80813
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 25, 2023
bbc07b7
add CHAR collation test cases
hyoj0942 Sep 25, 2023
30c7d5e
Merge branch 'render_column_type' of https://github.com/hyoj0942/sqla…
hyoj0942 Sep 25, 2023
f4989fe
fix test file
hyoj0942 Sep 25, 2023
1a9ab17
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 25, 2023
392f5c5
drop hypothesis
hyoj0942 Sep 25, 2023
4a12fbf
Merge branch 'render_column_type' of https://github.com/hyoj0942/sqla…
hyoj0942 Sep 25, 2023
3aa604c
Fixes #285 drop duplicate imports
hyoj0942 Sep 27, 2023
1c00f16
Merge branch 'render_column_type' of https://github.com/hyoj0942/sqla…
hyoj0942 Sep 27, 2023
ac1bdb0
fire previous Fixed codes
hyoj0942 Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/sqlacodegen/generators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,15 @@ def group_imports(self) -> list[list[str]]:
future_imports: list[str] = []
stdlib_imports: list[str] = []
thirdparty_imports: list[str] = []
duplicate_imports = set()

for package in sorted(self.imports):
imports = ", ".join(sorted(self.imports[package]))
imports = sorted(self.imports[package])
unique_imports = [
import_ for import_ in imports if import_ not in duplicate_imports
]
duplicate_imports.update(imports)
imports_str = ", ".join(unique_imports)
collection = thirdparty_imports
if package == "__future__":
collection = future_imports
Expand All @@ -304,7 +310,7 @@ def group_imports(self) -> list[list[str]]:
if "site-packages" not in (sys.modules[package].__file__ or ""):
collection = stdlib_imports

collection.append(f"from {package} import {imports}")
collection.append(f"from {package} import {imports_str}")

for module in sorted(self.module_imports):
thirdparty_imports.append(f"import {module}")
Expand Down