Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 47eb7183 authored by Bruno Guillon's avatar Bruno Guillon
Browse files

Merge branch 'master' into features/helpers

parents 46988c56 4d940d36
Branches
No related tags found
No related merge requests found
Pipeline #999835 failed
...@@ -32,6 +32,7 @@ type-checking: ...@@ -32,6 +32,7 @@ type-checking:
- medium - medium
image: "$CI_REGISTRY_IMAGE/qbcontainer" image: "$CI_REGISTRY_IMAGE/qbcontainer"
script: script:
- find -name '__pycache__' -type d -exec rm {} +
- python3 -m mypy --install-types --non-interactive querybuilder/ - python3 -m mypy --install-types --non-interactive querybuilder/
test: test:
......
...@@ -320,25 +320,26 @@ class Field: ...@@ -320,25 +320,26 @@ class Field:
def to_named_column( def to_named_column(
self: NamedColumn | ColumnSpec, self: NamedColumn | ColumnSpec,
relation_name: Optional[str] = None, relation_name: str | None | _MISSING_TYPE = MISSING,
schema_name: Optional[str] = None, schema_name: str | None | _MISSING_TYPE = MISSING,
) -> NamedColumn: ) -> NamedColumn:
assert self.name assert self.name
assert self.sqltype assert self.sqltype
assert ( if relation_name is MISSING:
not self.relation_name relation_name = self.relation_name
or not relation_name elif relation_name is None:
or self.relation_name == relation_name schema_name = None
) relation_name = cast(Optional[str], relation_name)
assert ( if schema_name is MISSING:
not self.schema_name or not schema_name or self.schema_name == schema_name schema_name = self.schema_name
) schema_name = cast(Optional[str], schema_name)
return NamedColumn( if relation_name:
self.sqltype, assert not self.relation_name or self.relation_name == relation_name
self.name, if schema_name:
self.relation_name or relation_name, assert relation_name
self.schema_name or schema_name, assert not self.schema_name or self.schema_name == schema_name
)
return NamedColumn(self.sqltype, self.name, relation_name, schema_name)
@classmethod @classmethod
def _resolve_str_spec( def _resolve_str_spec(
...@@ -506,7 +507,7 @@ class Field: ...@@ -506,7 +507,7 @@ class Field:
) -> Optional[qb.atoms.constraints.ColumnCheck]: ) -> Optional[qb.atoms.constraints.ColumnCheck]:
check: Optional[str | Column | qb.atoms.constraints.ColumnCheck | tuple | dict] check: Optional[str | Column | qb.atoms.constraints.ColumnCheck | tuple | dict]
if callable(self.check): if callable(self.check):
check = self.check(self.to_named_column(), relation) check = self.check(self.to_named_column(relation_name=None), rel)
else: else:
check = self.check check = self.check
if check is None: if check is None:
...@@ -540,6 +541,7 @@ class Field: ...@@ -540,6 +541,7 @@ class Field:
qb.atoms.constraints.ColumnDefault, qb.atoms.constraints.ColumnDefault,
] ]
if callable(self.default): if callable(self.default):
# TODO: when is a callable default useful?
default = self.default(self.to_named_column()) default = self.default(self.to_named_column())
else: else:
default = self.default default = self.default
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment