Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
Querybuilder
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pydisk
Querybuilder
Commits
4d940d36
Commit
4d940d36
authored
1 year ago
by
PAPERMAN Charles
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix/fix_check_in_ColumnSpec' into 'master'
Hotfix/fix check in column spec See merge request
!96
parents
22fcb196
2d11182b
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!96
Hotfix/fix check in column spec
Pipeline
#999831
passed
1 year ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
querybuilder/helpers/schema.py
+19
-17
19 additions, 17 deletions
querybuilder/helpers/schema.py
with
19 additions
and
17 deletions
querybuilder/helpers/schema.py
+
19
−
17
View file @
4d940d36
...
...
@@ -320,25 +320,26 @@ class ColumnSpec:
def
to_named_column
(
self
:
NamedColumn
|
ColumnSpec
,
relation_name
:
Optional
[
str
]
=
None
,
schema_name
:
Optional
[
str
]
=
None
,
relation_name
:
str
|
None
|
_MISSING_TYPE
=
MISSING
,
schema_name
:
str
|
None
|
_MISSING_TYPE
=
MISSING
,
)
->
NamedColumn
:
assert
self
.
name
assert
self
.
sqltype
assert
(
not
self
.
relation_name
or
not
relation_name
or
self
.
relation_name
==
relation_name
)
assert
(
not
self
.
schema_name
or
not
schema_name
or
self
.
schema_name
==
schema_name
)
return
NamedColumn
(
self
.
sqltype
,
self
.
name
,
self
.
relation_name
or
relation_name
,
self
.
schema_name
or
schema_name
,
)
if
relation_name
is
MISSING
:
relation_name
=
self
.
relation_name
elif
relation_name
is
None
:
schema_name
=
None
relation_name
=
cast
(
Optional
[
str
],
relation_name
)
if
schema_name
is
MISSING
:
schema_name
=
self
.
schema_name
schema_name
=
cast
(
Optional
[
str
],
schema_name
)
if
relation_name
:
assert
not
self
.
relation_name
or
self
.
relation_name
==
relation_name
if
schema_name
:
assert
relation_name
assert
not
self
.
schema_name
or
self
.
schema_name
==
schema_name
return
NamedColumn
(
self
.
sqltype
,
self
.
name
,
relation_name
,
schema_name
)
@classmethod
def
_resolve_str_spec
(
...
...
@@ -467,7 +468,7 @@ class ColumnSpec:
check
:
Optional
[
str
|
Column
|
qb
.
atoms
.
constraints
.
ColumnCheck
|
tuple
|
dict
]
if
callable
(
self
.
check
):
check
=
self
.
check
(
self
.
to_named_column
(),
rel
)
check
=
self
.
check
(
self
.
to_named_column
(
relation_name
=
None
),
rel
)
else
:
check
=
self
.
check
if
check
is
not
None
:
...
...
@@ -497,6 +498,7 @@ class ColumnSpec:
qb
.
atoms
.
constraints
.
ColumnDefault
,
]
if
callable
(
self
.
default
):
# TODO: when is a callable default useful?
default
=
self
.
default
(
self
.
to_named_column
())
else
:
default
=
self
.
default
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment