Skip to content

Fix _render_string_type signature to accept name, length, collation e… #77

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix _render_string_type signature to accept name, length, collation e… #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 9 additions & 53 deletions sqlalchemy_firebird/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,62 +377,18 @@ def visit_boolean(self, type_, **kw):
def visit_datetime(self, type_, **kw):
return self.visit_TIMESTAMP(type_, **kw)

def _render_string_type(self, type_, name, length_override=None):
firebird_3_or_lower = (
self.dialect.server_version_info
and self.dialect.server_version_info < (4,)
)

length = coalesce(
length_override,
getattr(type_, "length", None),
)
charset = getattr(type_, "charset", None)
collation = getattr(type_, "collation", None)

if name in ["BINARY", "VARBINARY", "NCHAR", "NVARCHAR"]:
charset = None
collation = None

if name == "NVARCHAR":
name = "NATIONAL CHARACTER VARYING"

if firebird_3_or_lower:
if name == "BINARY":
name = "CHAR"
charset = fb_types.BINARY_CHARSET
collation = None
elif name == "VARBINARY":
name = "VARCHAR"
charset = fb_types.BINARY_CHARSET
collation = None

def _render_string_type(
self, name: str, length: Optional[int], collation: Optional[str]
) -> str:
text = name
if length is None:
if name == "VARBINARY" or (
name == "VARCHAR" and charset == fb_types.BINARY_CHARSET
):
text = "BLOB SUB_TYPE BINARY"
charset = fb_types.BINARY_CHARSET
collation = None
elif name == "VARCHAR":
text = "BLOB SUB_TYPE TEXT"
elif name == "NATIONAL CHARACTER VARYING":
text = "BLOB SUB_TYPE TEXT"
charset = fb_types.NATIONAL_CHARSET
collation = None

text = text + (length and "(%d)" % length or "")

if charset is not None:
text += f" CHARACTER SET {charset}"

if collation is not None:
text += f" COLLATE {collation}"

if length:
text += f"({length})"
if collation:
text += f' COLLATE "{collation}"'
return text

def visit_BINARY(self, type_, **kw):

return self._render_string_type(type_, "BINARY")

def visit_VARBINARY(self, type_, **kw):
Expand Down