Skip to content

♻ Refactor internal statements to simplify code #53

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

Merged
merged 6 commits into from
Aug 27, 2022
Merged

♻ Refactor internal statements to simplify code #53

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52b5c12
chore : Hoist repeated code outside conditional statement
yezz123 Aug 28, 2021
0a5460b
Merges multiple nested `if` conditions into one
yezz123 Aug 28, 2021
ff2beb7
Merge pull request #1 from yezz123/chore
yezz123 Aug 28, 2021
2a91647
Merge branch 'main' into main
yezz123 Aug 27, 2022
eda3d8a
🔧 changes
yezz123 Aug 27, 2022
0c054ab
Merge branch 'main' into main
yezz123 Aug 27, 2022
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
8 changes: 3 additions & 5 deletions sqlmodel/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,8 @@ def __setattr__(self, name: str, value: Any) -> None:
return
else:
# Set in SQLAlchemy, before Pydantic to trigger events and updates
if getattr(self.__config__, "table", False):
if is_instrumented(self, name):
set_attribute(self, name, value)
if getattr(self.__config__, "table", False) and is_instrumented(self, name):
set_attribute(self, name, value)
# Set in Pydantic model to trigger possible validation changes, only for
# non relationship values
if name not in self.__sqlmodel_relationships__:
Expand Down Expand Up @@ -613,7 +612,7 @@ def _calculate_keys(
exclude_unset: bool,
update: Optional[Dict[str, Any]] = None,
) -> Optional[AbstractSet[str]]:
if include is None and exclude is None and exclude_unset is False:
if include is None and exclude is None and not exclude_unset:
# Original in Pydantic:
# return None
# Updated to not return SQLAlchemy attributes
Expand All @@ -631,7 +630,6 @@ def _calculate_keys(
# Do not include relationships as that would easily lead to infinite
# recursion, or traversing the whole database
keys = self.__fields__.keys() # | self.__sqlmodel_relationships__.keys()

if include is not None:
keys &= include.keys()

Expand Down