Skip to content

feat: nested session causes deadlock #67

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 1 commit into from
May 30, 2024
Merged

feat: nested session causes deadlock #67

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
15 changes: 9 additions & 6 deletions casbin_sqlalchemy_adapter/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,15 @@ def filter_query(self, querydb, filter):
)
return querydb.order_by(self._db_class.id)

def _save_policy_line(self, ptype, rule):
with self._session_scope() as session:
line = self._db_class(ptype=ptype)
for i, v in enumerate(rule):
setattr(line, "v{}".format(i), v)
def _save_policy_line(self, ptype, rule, session=None):
line = self._db_class(ptype=ptype)
for i, v in enumerate(rule):
setattr(line, "v{}".format(i), v)
if session:
session.add(line)
else:
with self._session_scope() as session:
session.add(line)

def save_policy(self, model):
"""saves all policy rules to the storage."""
Expand All @@ -144,7 +147,7 @@ def save_policy(self, model):
continue
for ptype, ast in model.model[sec].items():
for rule in ast.policy:
self._save_policy_line(ptype, rule)
self._save_policy_line(ptype, rule, session=session)
return True

def add_policy(self, sec, ptype, rule):
Expand Down