Merge branch 'master' of https://github.com/php-casbin/database-adapter

leeqvip · leeqvip · commit 4d94595cae15 · 2019-08-26T18:36:56.000+08:00
diff --git a/src/Adapter.php b/src/Adapter.php
@@ -110,8 +110,10 @@ public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
         $condition[] = 'ptype = :ptype';
         foreach (range(0, 5) as $value) {
             if ($fieldIndex <= $value && $value < $fieldIndex + count($fieldValues)) {
-                $where['v'.strval($value)] = $fieldValues[$value - $fieldIndex];
-                $condition[] = 'v'.strval($value).' = :'.'v'.strval($value);
+                if ('' != $fieldValues[$value - $fieldIndex]) {
+                    $where['v'.strval($value)] = $fieldValues[$value - $fieldIndex];
+                    $condition[] = 'v'.strval($value).' = :'.'v'.strval($value);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,10 @@ public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)`
`110`	`110`	`$condition[] = 'ptype = :ptype';`
`111`	`111`	`foreach (range(0, 5) as $value) {`
`112`	`112`	`if ($fieldIndex <= $value && $value < $fieldIndex + count($fieldValues)) {`
`113`		`- $where['v'.strval($value)] = $fieldValues[$value - $fieldIndex];`
`114`		`- $condition[] = 'v'.strval($value).' = :'.'v'.strval($value);`
	`113`	`+ if ('' != $fieldValues[$value - $fieldIndex]) {`
	`114`	`+ $where['v'.strval($value)] = $fieldValues[$value - $fieldIndex];`
	`115`	`+ $condition[] = 'v'.strval($value).' = :'.'v'.strval($value);`
	`116`	`+ }`
`115`	`117`	`}`
`116`	`118`	`}`
`117`	`119`