Merge pull request #53 from cidosx/master

Improve DatabaseAdapter
php-casbin · Nov 3, 2022 · 774857a · 774857a
2 parents 5de36c5 + 7e21d0c
commit 774857a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Adapters/DatabaseAdapter.php b/src/Adapters/DatabaseAdapter.php
@@ -186,7 +186,7 @@ public function removePolicy(string $sec, string $ptype, array $rule): void
      */
     public function removePolicies(string $sec, string $ptype, array $rules): void
     {
-        DB::transaction(function () use ($sec, $rules, $ptype) {
+        $this->eloquent->getConnection()->transaction(function () use ($sec, $rules, $ptype) {
             foreach ($rules as $rule) {
                 $this->removePolicy($sec, $ptype, $rule);
             }
@@ -256,7 +256,11 @@ public function updatePolicy(string $sec, string $ptype, array $oldRule, array $
         foreach($oldRule as $k => $v) {
             $instance->where('v' . $k, $v);
         }
-        $instance->first();
+        $instance = $instance->first();
+        if (!$instance) {
+            return;
+        }
+
         $update = [];
         foreach($newPolicy as $k => $v) {
             $update['v' . $k] = $v;
@@ -276,7 +280,7 @@ public function updatePolicy(string $sec, string $ptype, array $oldRule, array $
      */
     public function updatePolicies(string $sec, string $ptype, array $oldRules, array $newRules): void
     {
-        DB::transaction(function () use ($sec, $ptype, $oldRules, $newRules) {
+        $this->eloquent->getConnection()->transaction(function () use ($sec, $ptype, $oldRules, $newRules) {
             foreach ($oldRules as $i => $oldRule) {
                 $this->updatePolicy($sec, $ptype, $oldRule, $newRules[$i]);
             }
@@ -296,7 +300,7 @@ public function updatePolicies(string $sec, string $ptype, array $oldRules, arra
     public function updateFilteredPolicies(string $sec, string $ptype, array $newPolicies, int $fieldIndex, string ...$fieldValues): array
     {
         $oldRules = [];
-        DB::transaction(function () use ($sec, $ptype, $fieldIndex, $fieldValues, $newPolicies, &$oldRules) {
+        $this->eloquent->getConnection()->transaction(function () use ($sec, $ptype, $fieldIndex, $fieldValues, $newPolicies, &$oldRules) {
             $oldRules = $this->_removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues);
             $this->addPolicies($sec, $ptype, $newPolicies);
         });