Skip to content

Improve Efficiency #5

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
Oct 25, 2019
Merged

Improve Efficiency #5

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
59 changes: 15 additions & 44 deletions casbin_sqlalchemy_adapter/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,12 @@ class CasbinRule(Base):
v5 = Column(String(255))

def __str__(self):
text = self.ptype

if self.v0:
text = text + ', ' + self.v0
if self.v1:
text = text + ', ' + self.v1
if self.v2:
text = text + ', ' + self.v2
if self.v3:
text = text + ', ' + self.v3
if self.v4:
text = text + ', ' + self.v4
if self.v5:
text = text + ', ' + self.v5
return text
arr = [self.ptype]
for v in (self.v0, self.v1, self.v2, self.v3, self.v4, self.v5):
if v is None:
break
arr.append(v)
return ', '.join(arr)

def __repr__(self):
return '<CasbinRule {}: "{}">'.format(self.id, str(self))
Expand Down Expand Up @@ -62,18 +53,8 @@ def load_policy(self, model):

def _save_policy_line(self, ptype, rule):
line = CasbinRule(ptype=ptype)
if len(rule) > 0:
line.v0 = rule[0]
if len(rule) > 1:
line.v1 = rule[1]
if len(rule) > 2:
line.v2 = rule[2]
if len(rule) > 3:
line.v3 = rule[3]
if len(rule) > 4:
line.v4 = rule[4]
if len(rule) > 5:
line.v5 = rule[5]
for i, v in enumerate(rule):
setattr(line, 'v{}'.format(i), v)
self._session.add(line)
self._session.commit()

Expand All @@ -95,19 +76,8 @@ def remove_policy(self, sec, ptype, rule):
"""removes a policy rule from the storage."""
query = self._session.query(CasbinRule)
query = query.filter(CasbinRule.ptype == ptype)
if len(rule) > 0:
query = query.filter(CasbinRule.v0 == rule[0])
if len(rule) > 1:
query = query.filter(CasbinRule.v1 == rule[1])
if len(rule) > 2:
query = query.filter(CasbinRule.v2 == rule[2])
if len(rule) > 3:
query = query.filter(CasbinRule.v3 == rule[3])
if len(rule) > 4:
query = query.filter(CasbinRule.v4 == rule[4])
if len(rule) > 5:
query = query.filter(CasbinRule.v5 == rule[5])

for i, v in enumerate(rule):
query = query.filter(getattr(CasbinRule, 'v{}'.format(i)) == v)
r = query.delete()
self._session.commit()

Expand All @@ -119,11 +89,12 @@ def remove_filtered_policy(self, sec, ptype, field_index, *field_values):
"""
query = self._session.query(CasbinRule)
query = query.filter(CasbinRule.ptype == ptype)
if field_index < 0 or len(field_values)>6:
if not (0 <= field_index <= 5):
return False
if not (1 <= field_index + len(field_values) <= 6):
return False
for i in range(len(field_values)):
if field_values[i] != "":
query = query.filter(getattr(CasbinRule, 'v' + str(field_index + i)) == field_values[i])
for i, v in enumerate(field_values):
query = query.filter(getattr(CasbinRule, 'v{}'.format(field_index + i)) == v)
r = query.delete()
self._session.commit()

Expand Down